diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-11-10 12:29:26 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-11-10 12:29:26 -0800 |
| commit | 2e38b1dbb874cd20cfa7ca0731789fd41a536bad (patch) | |
| tree | f366b1ad034963727367995f8f953c96b5997cd1 /translations | |
| parent | 4753d5c15c7a1e9e4acf04e3aa72ead8ab72a363 (diff) | |
| download | subsurface-2e38b1dbb874cd20cfa7ca0731789fd41a536bad.tar.gz | |
Update translation strings and translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations')
29 files changed, 12628 insertions, 11063 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index 3f43977fc..f64dd2c18 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -5,19 +5,19 @@ <message> <location filename="../qt-ui/simplewidgets.cpp" line="487"/> <source>Person: </source> - <translation type="unfinished"/> + <translation>Лице:</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -26,26 +26,26 @@ <message> <location filename="../configuredivecomputer.cpp" line="227"/> <source>Could not save the backup file %1. Error Message: %2</source> - <translation type="unfinished"/> + <translation>Не може да бъде записън бекъп файл %1. Грешка: %2</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="243"/> <source>Could not open backup file: %1</source> - <translation type="unfinished"/> + <translation>Не може да бъде отворен бекъп файл: %1</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="567"/> <source>Setting successfully written to device</source> - <translation type="unfinished"/> + <translation>Настройките успешно записани на устройството</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="576"/> <source>Device firmware successfully updated</source> - <translation type="unfinished"/> + <translation>Фърмуер успешно обновен</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -54,7 +54,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/> <source>Configure dive computer</source> - <translation type="unfinished"/> + <translation>Настрой леководолазен комютър</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="22"/> @@ -69,27 +69,27 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="54"/> <source>Retrieve available details</source> - <translation type="unfinished"/> + <translation>Изтегли детайли</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="67"/> <source>Save changes to device</source> - <translation type="unfinished"/> + <translation>Запиши промени на устройство</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/> <source>Backup</source> - <translation type="unfinished"/> + <translation>Бекъп</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="100"/> <source>Restore backup</source> - <translation type="unfinished"/> + <translation>Върни бекъп</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="110"/> <source>Update firmware</source> - <translation type="unfinished"/> + <translation>Обнови фърмуер</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="134"/> @@ -99,35 +99,35 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="171"/> <source>OSTC 3</source> - <translation type="unfinished"/> + <translation>OSTC 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="210"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1242"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1618"/> <source>Basic settings</source> - <translation type="unfinished"/> + <translation>Общи настройки</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="216"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1337"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1634"/> <source>Serial No.</source> - <translation type="unfinished"/> + <translation>Сериен номер</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="239"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1360"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1657"/> <source>Firmware version</source> - <translation type="unfinished"/> + <translation>Фърмуер версия</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="256"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1394"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1674"/> <source>Custom text</source> - <translation type="unfinished"/> + <translation>Потребителски текс</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="279"/> @@ -137,75 +137,75 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="290"/> <source>English</source> - <translation type="unfinished"/> + <translation>Английски</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="295"/> <source>German</source> - <translation type="unfinished"/> + <translation>Немски</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="300"/> <source>French</source> - <translation type="unfinished"/> + <translation>Френски</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="305"/> <source>Italian</source> - <translation type="unfinished"/> + <translation>Италиански</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/> <source>Dive mode</source> - <translation type="unfinished"/> + <translation>Режим на гмуркане</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="324"/> <source>OC</source> - <translation type="unfinished"/> + <translation>OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="329"/> <source>CC</source> - <translation type="unfinished"/> + <translation>CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="334"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1930"/> <source>Gauge</source> - <translation type="unfinished"/> + <translation>Калибър</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="339"/> <source>Apnea</source> - <translation type="unfinished"/> + <translation>Апнеа</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="347"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1802"/> <source>Date format</source> - <translation type="unfinished"/> + <translation>Формат на датата</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/> <source>MMDDYY</source> - <translation type="unfinished"/> + <translation>ММДДГГ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="363"/> <source>DDMMYY</source> - <translation type="unfinished"/> + <translation>ДДММГГ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="368"/> <source>YYMMDD</source> - <translation type="unfinished"/> + <translation>ГГММДД</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="841"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2022"/> <source>Saturation</source> - <translation type="unfinished"/> + <translation>Сатурация</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="439"/> @@ -223,19 +223,19 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2032"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2048"/> <source>%</source> - <translation type="unfinished"/> + <translation>%</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="678"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1833"/> <source>Desaturation</source> - <translation type="unfinished"/> + <translation>Десатурация</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="796"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1963"/> <source>Last deco</source> - <translation type="unfinished"/> + <translation>Последна декомпресия</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="717"/> @@ -246,39 +246,39 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/> <source>Brightness</source> - <translation type="unfinished"/> + <translation>Яркост</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="387"/> <source>Eco</source> - <translation type="unfinished"/> + <translation>Еко</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="392"/> <source>Medium</source> - <translation type="unfinished"/> + <translation>Средно</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="397"/> <source>High</source> - <translation type="unfinished"/> + <translation>Високо</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="522"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1792"/> <source>Sampling rate</source> - <translation type="unfinished"/> + <translation>Честота</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/> <source>2s</source> - <translation type="unfinished"/> + <translation>2сек.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="538"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1450"/> <source>10s</source> - <translation type="unfinished"/> + <translation>10сек.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="405"/> @@ -289,147 +289,151 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="416"/> <source>m/°C</source> - <translation type="unfinished"/> + <translation>м/°C</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="421"/> <source>ft/°F</source> - <translation type="unfinished"/> + <translation>фута/°F</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="546"/> <source>Dive mode color</source> - <translation type="unfinished"/> + <translation>Цветови режим</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="557"/> <source>Standard</source> - <translation type="unfinished"/> + <translation>Стандарт</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="562"/> <source>Red</source> - <translation type="unfinished"/> + <translation>Червен</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="567"/> <source>Green</source> - <translation type="unfinished"/> + <translation>Зелен</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="572"/> <source>Blue</source> - <translation type="unfinished"/> + <translation>Син</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="429"/> <source>Salinity (0-5%)</source> - <translation type="unfinished"/> + <translation>Соленост (0-5%)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="580"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1726"/> <source>Sync dive computer time with PC</source> - <translation type="unfinished"/> + <translation>Синхронизирай времето на Г.К. с PC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="449"/> <source>Compass gain</source> - <translation type="unfinished"/> + <translation>Компас настройка</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/> <source>Read settings from backup file or from device before writing to the device</source> - <translation type="unfinished"/> + <translation>Прочети настройки от бекъп файл или от устройството преди запис</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/> <source>Read settings from backup file or from device before writing to a backup file</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> + <translation>Прочети настройки от бекъп файл или от устройството преди запис на бекъп файл</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> - <translation type="unfinished"/> + <translation>OSTC, Mk.2/2N/2C</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="466"/> <source>230LSB/Gauss</source> - <translation type="unfinished"/> + <translation>230LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="471"/> <source>330LSB/Gauss</source> - <translation type="unfinished"/> + <translation>330LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="476"/> <source>390LSB/Gauss</source> - <translation type="unfinished"/> + <translation>390LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="481"/> <source>440LSB/Gauss</source> - <translation type="unfinished"/> + <translation>440LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="486"/> <source>660LSB/Gauss</source> - <translation type="unfinished"/> + <translation>660LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="491"/> <source>820LSB/Gauss</source> - <translation type="unfinished"/> + <translation>820LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="496"/> <source>1090LSB/Gauss</source> - <translation type="unfinished"/> + <translation>1090LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="501"/> <source>1370LSB/Gauss</source> - <translation type="unfinished"/> + <translation>1370LSB/Gauss</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="587"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/> <source>Show safety stop</source> - <translation type="unfinished"/> + <translation>Покажи безопасен стоп</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="597"/> <source>Reset device to default settings</source> - <translation type="unfinished"/> + <translation>Рестартирай настройки по подразбиране</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> - <translation type="unfinished"/> + <translation>Разширени настройки</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/> <source>Alt GF can be selected underwater</source> + <translation>Alt GF може да бъде избран по водата</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> - <translation type="unfinished"/> + <translation>Бъдещ TTS</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/> <source>Pressure sensor offset</source> - <translation type="unfinished"/> + <translation>Отклонение на датчика за налягане</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/> @@ -447,52 +451,52 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/> <source>Decotype</source> - <translation type="unfinished"/> + <translation>Тип декомпресия</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/> <source> mbar</source> - <translation type="unfinished"/> + <translation>м.бара</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="769"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1892"/> <source> min</source> - <translation type="unfinished"/> + <translation>мин</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="783"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1925"/> <source>ZH-L16</source> - <translation type="unfinished"/> + <translation>ZH-L16</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/> <source>ZH-L16+GF</source> - <translation type="unfinished"/> + <translation>ZH-L16+GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="851"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/> <source>Alt GFLow</source> - <translation type="unfinished"/> + <translation>Alt GFLow</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="858"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2015"/> <source>Alt GFHigh</source> - <translation type="unfinished"/> + <translation>Alt GFHigh</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="865"/> <source>Flip screen</source> - <translation type="unfinished"/> + <translation>Обърни екрана</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="873"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2079"/> <source>Gas settings</source> - <translation type="unfinished"/> + <translation>Газ настройки</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="916"/> @@ -500,7 +504,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2122"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2207"/> <source>%O2</source> - <translation type="unfinished"/> + <translation>%O2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="921"/> @@ -508,7 +512,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2127"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2212"/> <source>%He</source> - <translation type="unfinished"/> + <translation>%He</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="926"/> @@ -524,127 +528,127 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2137"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2222"/> <source>Change depth</source> - <translation type="unfinished"/> + <translation>Промени дълбочина</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="936"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2142"/> <source>Gas 1</source> - <translation type="unfinished"/> + <translation>Газ 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="941"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2147"/> <source>Gas 2</source> - <translation type="unfinished"/> + <translation>Газ 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="946"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2152"/> <source>Gas 3</source> - <translation type="unfinished"/> + <translation>Газ 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="951"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2157"/> <source>Gas 4</source> - <translation type="unfinished"/> + <translation>Газ 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="956"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2162"/> <source>Gas 5</source> - <translation type="unfinished"/> + <translation>Газ 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1021"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2227"/> <source>Dil 1</source> - <translation type="unfinished"/> + <translation>Dil 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1026"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2232"/> <source>Dil 2</source> - <translation type="unfinished"/> + <translation>Dil 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1031"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2237"/> <source>Dil 3</source> - <translation type="unfinished"/> + <translation>Dil 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1036"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2242"/> <source>Dil 4</source> - <translation type="unfinished"/> + <translation>Dil 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1041"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2247"/> <source>Dil 5</source> - <translation type="unfinished"/> + <translation>Dil 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1086"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2282"/> <source>Set point [cbar]</source> - <translation type="unfinished"/> + <translation>Постави точка [сенти бар]</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1091"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2287"/> <source>Change depth [m]</source> - <translation type="unfinished"/> + <translation>Промени дълбочина [м]</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1096"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2292"/> <source>SP 1</source> - <translation type="unfinished"/> + <translation>SP 1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1101"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2297"/> <source>SP 2</source> - <translation type="unfinished"/> + <translation>SP 2</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1106"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2302"/> <source>SP 3</source> - <translation type="unfinished"/> + <translation>SP 3</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1111"/> <source>SP 4</source> - <translation type="unfinished"/> + <translation>SP 4</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1116"/> <source>SP 5</source> - <translation type="unfinished"/> + <translation>SP 5</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/> <source>O2 in calibration gas</source> - <translation type="unfinished"/> + <translation>O2 в газ за настройка</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/> <source>Fixed setpoint</source> - <translation type="unfinished"/> + <translation>Фиксиран сетпойнт</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/> <source>Sensor</source> - <translation type="unfinished"/> + <translation>Сензор</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/> <source>Setpoint fallback</source> - <translation type="unfinished"/> + <translation>Сетпойнт отстъпка</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/> @@ -652,29 +656,42 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2323"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/> <source> cbar</source> - <translation type="unfinished"/> + <translation>сенти бара</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> + <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> + <source>ppO2 max</source> + <translation>ppO2 макс</translation> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> - <translation type="unfinished"/> + <translation>ppO2 мин.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> <source>Safety level</source> - <translation type="unfinished"/> + <translation>Ниво на сугурност</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1290"/> <source>Altitude range</source> - <translation type="unfinished"/> + <translation>Височинен диапазон</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1297"/> @@ -685,7 +702,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1317"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1759"/> <source>Number of dives</source> - <translation type="unfinished"/> + <translation>Брой гмуркания</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/> @@ -696,49 +713,44 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P0 (няма)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> <source>P1 (some)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P1 (малко)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> <source>P2 (much)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P2 (много)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> - <translation type="unfinished"/> + <translation>Честота</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/> <source>20s</source> - <translation type="unfinished"/> + <translation>20сек</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/> <source>30s</source> - <translation type="unfinished"/> + <translation>30сек</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/> <source>60s</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> + <translation>60сек</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> - <translation type="unfinished"/> + <translation>Модел на комютъра</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1497"/> @@ -749,17 +761,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/> <source>24h</source> - <translation type="unfinished"/> + <translation>24ч</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/> <source>12h</source> - <translation type="unfinished"/> + <translation>12ч</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/> <source>Time format</source> - <translation type="unfinished"/> + <translation>Времеви формат</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1539"/> @@ -774,7 +786,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1555"/> <source>s</source> - <translation type="unfinished"/> + <translation>сек</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1562"/> @@ -784,12 +796,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1579"/> <source>Depth alarm</source> - <translation type="unfinished"/> + <translation>Дълбочинна аларма</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/> <source>Time alarm</source> - <translation type="unfinished"/> + <translation>Времева аларма</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1624"/> @@ -799,176 +811,178 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> <source>kg/l</source> - <translation type="unfinished"/> + <translation>кг/л</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> - <translation type="unfinished"/> + <translation>ММ/ДД/ГГ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/> <source>DD/MM/YY</source> - <translation type="unfinished"/> + <translation>ДД/ММ/ГГ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/> <source>YY/MM/DD</source> - <translation type="unfinished"/> + <translation>ГГ/ММ/ДД</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/> <source>ZH-L16 CC</source> - <translation type="unfinished"/> + <translation>ZH-L16 CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> <source>Apnoe</source> - <translation type="unfinished"/> + <translation>Апнея</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> - <translation type="unfinished"/> + <translation>L16-GF OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/> <source>L16-GF CC</source> - <translation type="unfinished"/> + <translation>L16-GF CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> <source>PSCR-GF</source> - <translation type="unfinished"/> + <translation>PSCR-GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="621"/> <source>Dive computer details read successfully.</source> - <translation type="unfinished"/> + <translation>Данни на гмуркачески компютър прочетени успешно</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="947"/> <source>Backup files (*.xml)</source> - <translation type="unfinished"/> + <translation>Бекъп файлове (*.xml)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="929"/> <source>An error occurred while saving the backup file. %1</source> - <translation type="unfinished"/> + <translation>Грешка при запис на бекъп файл. +%1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="933"/> <source>Backup succeeded</source> - <translation type="unfinished"/> + <translation>Бекъп успешен</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="934"/> <source>Your settings have been saved to: %1</source> - <translation type="unfinished"/> + <translation>Вашите настройки бяха записани в: %1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="921"/> <source>Backup dive computer settings</source> - <translation type="unfinished"/> + <translation>Бекъп на настройки на гмуркачески компютър</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> <source>XML backup error</source> - <translation type="unfinished"/> + <translation>XML бекъп грешка</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> <source>Restore dive computer settings</source> - <translation type="unfinished"/> + <translation>Върни настройки на гмуркачески компютър</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="951"/> <source>XML restore error</source> - <translation type="unfinished"/> + <translation>Грешка при XML връщане</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="952"/> <source>An error occurred while restoring the backup file. %1</source> - <translation type="unfinished"/> + <translation>Настъпи грешка докато се връщаше бекъп файла. +%1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="959"/> <source>Restore succeeded</source> - <translation type="unfinished"/> + <translation>Връщане успешно</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="960"/> <source>Your settings have been restored successfully.</source> - <translation type="unfinished"/> + <translation>Вашите настройки бяха върнати успешно.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="971"/> <source>Select firmware file</source> - <translation type="unfinished"/> + <translation>Изберете фърмуер файл</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="972"/> <source>All files (*.*)</source> - <translation type="unfinished"/> + <translation>Всички файлове (*.*)</translation> </message> </context> <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Големина</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Работно налягане</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Начално налягане</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Крайно налягане</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Превключи при</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Кликнете тук за да изтриете бутилка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Бутилката не може да бъде премахната</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Този газ се използвза. Само бутилки, които не се използват в гмуркането могат да бъдат премахнати.</translation> </message> @@ -978,12 +992,12 @@ <message> <location filename="../qt-ui/divecomponentselection.ui" line="23"/> <source>Component selection</source> - <translation type="unfinished"/> + <translation>Избор на компонент</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="40"/> <source>Which components would you like to copy</source> - <translation type="unfinished"/> + <translation>Кои компоненти бихте желали да копирате</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="46"/> @@ -998,7 +1012,7 @@ <message> <location filename="../qt-ui/divecomponentselection.ui" line="60"/> <source>GPS coordinates</source> - <translation type="unfinished"/> + <translation>GPS координати</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="67"/> @@ -1064,22 +1078,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Модел</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Име на устройство</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Прякор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Кликнете тук за да изтриете този гмуркачески компютър.</translation> </message> @@ -1107,97 +1121,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> - <translation type="unfinished"/> + <translation>Дълбочина(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> - <translation type="unfinished"/> + <translation>Температура(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> - <translation type="unfinished"/> + <translation>Тежест(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Бут.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> - <translation type="unfinished"/> + <translation>Газ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> - <translation type="unfinished"/> + <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -1205,87 +1219,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Разшири всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Свиване на всички</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Свиване на други</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Изтрий гмуркане (гмуркания) от пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Създай ново пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Слей пътуване с горно пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Слей пътуване с долно пътуване</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Изтрий гмуркане (гмуркания)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Маркирай гмуркания (гмуркане) като невалидни</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Слей избраните гмуркания</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Преномерирай гмуркане (гмуркания)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Измести времена</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Зареди изображения</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Отвори изображения</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1357,12 +1371,12 @@ <message> <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> <source>DiveShare</source> - <translation type="unfinished"/> + <translation>DiveShare</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>Image depths</source> - <translation type="unfinished"/> + <translation>Дълбочина на изображения</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> @@ -1377,7 +1391,7 @@ <message> <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export yearly statistics</source> - <translation type="unfinished"/> + <translation>Изтегли годишни статистики</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> @@ -1477,7 +1491,7 @@ <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to dive-share.appspot.com website</source> - <translation type="unfinished"/> + <translation>Изпрати данните към сайта dive-share.appspot.com</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> @@ -1492,7 +1506,7 @@ <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Write depths of images to file.</source> - <translation type="unfinished"/> + <translation>Запиши дълбочините във файл.</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> @@ -1528,7 +1542,7 @@ <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> <source>Save image depths</source> - <translation type="unfinished"/> + <translation>Запиши дълбочините</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> @@ -1698,27 +1712,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Височина</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Планирано гмуркаческо време</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>АТМ налягане</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>м.бара</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>м</translation> </message> @@ -1731,37 +1745,37 @@ <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Финална дълбочина</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Teчащо време</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Използван газ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC поставена точка</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Изтрий плана?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Вие ще изтриете плана.</translation> </message> @@ -1783,6 +1797,11 @@ <source>Add dive data point</source> <translation>Добави точка в гмуркането</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1834,7 +1853,7 @@ <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>Ambient pressure</source> - <translation type="unfinished"/> + <translation>Околно налягане</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> @@ -1877,32 +1896,32 @@ <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="48"/> <source>⌫</source> - <translation type="unfinished"/> + <translation>⌫</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> <source><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> Ако не използвате UserID трябва да маркирате гмурканията си на ръка за да ги откриете отново.</p></body></html></translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="80"/> <source>Private dives will not appear in "related dives" lists, and will only be accessible if their URL is known.</source> - <translation type="unfinished"/> + <translation>Личните гмуркания няма да се появят в списъка "подобни гмуркания" и ще бъдат достъпни само ако тяхния URL е наличен.</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="83"/> <source>Keep dives private</source> - <translation type="unfinished"/> + <translation>Маркирай гмурканията като лични</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="105"/> <source>Upload dive data</source> - <translation type="unfinished"/> + <translation>Качи данните за гмуркане</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> @@ -1911,133 +1930,137 @@ p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.google.com"><span style=" text-decoration: underline; color:#0000ff;">asd</span></a></p></body></html></source> - <translation type="unfinished"/> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.google.com"><span style=" text-decoration: underline; color:#0000ff;">asd</span></a></p></body></html></translation> </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> - <translation type="unfinished"/> + <translation>Тежест(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Водолазен костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Бут.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> - <translation type="unfinished"/> + <translation>Газ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> - <translation type="unfinished"/> + <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> - <translation type="unfinished"/> + <translation>Дълбочина(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> - <translation type="unfinished"/> + <translation>Температура(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2255,6 +2278,19 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="146"/> <source>Download into new trip</source> + <translation>Изтегли в ново пътуване</translation> + </message> +</context> +<context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> <translation type="unfinished"/> </message> </context> @@ -2267,13 +2303,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> <source>Filter this list</source> - <translation type="unfinished"/> + <translation>Филтрирай списъка</translation> </message> </context> <context> @@ -2281,17 +2317,17 @@ p, li { white-space: pre-wrap; } <message> <location filename="../configuredivecomputerthreads.cpp" line="1384"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>Firmware update failed!</source> - <translation type="unfinished"/> + <translation>Фърмуера не може да бъде обновен!</translation> </message> <message> <location filename="../configuredivecomputerthreads.cpp" line="1391"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> </context> <context> @@ -2307,14 +2343,14 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Location: </source> - <translation type="unfinished"/> + <translation>Местонахождение:</translation> </message> </context> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2358,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -2363,27 +2399,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Бележки</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Темп. на въздух</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Темп. на водата</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Бележки</translation> </message> @@ -2433,6 +2469,16 @@ p, li { white-space: pre-wrap; } <translation>Консумация на газ</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,91 +2551,91 @@ p, li { white-space: pre-wrap; } <translation>Снимки</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Бутилки</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Добави бутилка</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Тежести</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Добави система за тежест</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Запиши</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Отмяна</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Tемп. на въздуха [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Темп. на водата [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Това пътуване се редактира.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Редактира се повече от едно гмуркане.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Това гмуркане се редактира.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Бележки за пътуване</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Местонахождение на пътуване</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Най-дълбоко гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Най-плитко гмуркане</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2598,17 +2644,17 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>и</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Изтрий промените?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Вие ще изтриете промените.</translation> </message> @@ -2653,12 +2699,12 @@ mixed from Air and using: <message> <location filename="../qt-ui/mainwindow.ui" line="635"/> <source>Configure &dive computer</source> - <translation type="unfinished"/> + <translation>Настрой &леководолазен комютър</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="643"/> <source>Re-plan &dive</source> - <translation type="unfinished"/> + <translation>Планирай гмуркане &наново</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="655"/> @@ -2826,22 +2872,22 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="449"/> <source>&Copy dive components</source> - <translation type="unfinished"/> + <translation>&Копирай компоненти на гмуркане</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="452"/> <source>Ctrl+C</source> - <translation type="unfinished"/> + <translation>Ctrl+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="457"/> <source>&Paste dive components</source> - <translation type="unfinished"/> + <translation>&Залепи компоненти на гмуркане</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="460"/> <source>Ctrl+V</source> - <translation type="unfinished"/> + <translation>Ctrl+V</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="497"/> @@ -2916,38 +2962,37 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="638"/> <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="811"/> <source>Scale graph</source> - <translation type="unfinished"/> + <translation>Скалирай диаграмата</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="823"/> <source>Toggle pictures</source> - <translation type="unfinished"/> + <translation>Превключи изображения</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="835"/> <source>Toggle tank bar</source> - <translation type="unfinished"/> + <translation>Преключи бутилки</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> - <translation type="unfinished"/> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> + <translation>Ctrl+F</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="390"/> @@ -3130,60 +3175,60 @@ p, li { white-space: pre-wrap; } <translation>Напечатай рунтайм таблица</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Запиши промените?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Запиши файла като</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Отвори регистър файл</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Промените ще бъдат изгубени ако не ги запишете.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation> </message> @@ -3191,56 +3236,56 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>фута/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Последен стоп на 20фута</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% средна дълбочина до 20фута</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20фута то повърхността</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Последен стоп на 6 метра</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% средна дълбочина до 6м</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6м до повърхността</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> - <translation type="unfinished"/> + <translation>кб.фута/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> - <translation type="unfinished"/> + <translation>л/мин</translation> </message> </context> <context> @@ -3689,7 +3734,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/printlayout.cpp" line="71"/> <source>Subsurface cannot find a usable printer on this system!</source> - <translation type="unfinished"/> + <translation>Subsurface не може да намери подходящ принтер на тази система!</translation> </message> </context> <context> @@ -3753,72 +3798,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Гмуркане №%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Макс. дълбочина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Времетраене: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Използван газ:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Тагове:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Тежести:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Бележки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Водач:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Партньор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Водолазен костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Видимост:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Оценка:</translation> </message> @@ -3848,7 +3893,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation>(Танк %1)</translation> </message> <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> @@ -3949,42 +3994,42 @@ p, li { white-space: pre-wrap; } <translation>Кликнете два пъти на глобус картата за да дефинирате местонахождение на гмуркането.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>бара</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>кб.фута</translation> </message> @@ -4014,12 +4059,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../configuredivecomputerthreads.cpp" line="808"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> <location filename="../configuredivecomputerthreads.cpp" line="801"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> </context> <context> @@ -4046,12 +4091,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../configuredivecomputerthreads.cpp" line="1417"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> <location filename="../configuredivecomputerthreads.cpp" line="1422"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> </context> <context> @@ -4251,7 +4296,7 @@ p, li { white-space: pre-wrap; } <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> - <translation type="unfinished"/> + <translation>GroupBox</translation> </message> </context> <context> @@ -4259,31 +4304,31 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="462"/> <source>Tags: </source> - <translation type="unfinished"/> + <translation>Тагове:</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> - <translation type="unfinished"/> + <translation>Празни тагове</translation> </message> </context> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>мл.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>бара</translation> </message> @@ -4331,17 +4376,17 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/updatemanager.cpp" line="68"/> <source>A new version of subsurface is available.</source> - <translation type="unfinished"/> + <translation>Има нова версия на Subsurface.</translation> </message> <message> <location filename="../qt-ui/updatemanager.cpp" line="69"/> <source>Latest version is %1, please check with your OS vendor for updates.</source> - <translation type="unfinished"/> + <translation>Последната версия е %1. Моля проверете вашия OS доставчик за обновления.</translation> </message> <message> <location filename="../qt-ui/updatemanager.cpp" line="75"/> <source>Newest release version is </source> - <translation type="unfinished"/> + <translation>Най-новата весия е</translation> </message> <message> <location filename="../qt-ui/updatemanager.cpp" line="76"/> @@ -4512,12 +4557,12 @@ OS CPU архитектура %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>кг</translation> </message> @@ -4572,23 +4617,23 @@ OS CPU архитектура %1</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="286"/> <source>Transferring data...</source> - <translation type="unfinished"/> + <translation>Трансфер на данни...</translation> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Кликнете тук за да изтриете система за тежест.</translation> </message> @@ -4598,90 +4643,90 @@ OS CPU архитектура %1</translation> <message> <location filename="../configuredivecomputerthreads.cpp" line="1342"/> <source>This feature is not yet available for the selected dive computer.</source> - <translation type="unfinished"/> + <translation>Тази функционалност не е достъпна за избрания леководолазен комютър.</translation> </message> <message> <location filename="../configuredivecomputerthreads.cpp" line="1347"/> <source>Could not a establish connection to the dive computer.</source> - <translation type="unfinished"/> + <translation>Не може да се осъществи връзка с леководолазния компютър.</translation> </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Година > Месец / Пътуване</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Продължителност Общо</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Най-късо</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Най-дълго</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Дълбочина (%1) Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Минимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -4691,29 +4736,29 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>паскала</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>бара</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>кб.фута</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4721,56 +4766,56 @@ Maximum</source> <translation>м</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>м/сек</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>фута/мин</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>фута/сек</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>въздух</translation> </message> @@ -4801,31 +4846,31 @@ Maximum</source> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Не може да бъде прочетен '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> - <translation type="unfinished"/> + <translation>Проблем при Poseidon импорт: не може да бъде прочетен '%s'</translation> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> - <translation type="unfinished"/> + <translation>Няма подходящ Л.К. за файла '%s'</translation> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Максималният потдържан брой на CSV колони е %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>няма</translation> </message> @@ -4833,64 +4878,64 @@ Maximum</source> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>деко. стоп</translation> </message> <message> <location filename="../cochran.c" line="338"/> <source>battery</source> - <translation type="unfinished"/> + <translation>батерия</translation> </message> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>покачване</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>таван</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>натовареност</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>предавател</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>нарушение</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>бележка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>повърхност</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>безопасен стоп</translation> </message> @@ -4898,202 +4943,212 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>смяна на газ</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>безопасен стоп (свободен)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>безопасен стоп (задължителен)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>дълбочина на спиране</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>таван (безопасен стоп)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>време за гмуркане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>под</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>макс. дълбочина</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>време за въздух</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>посока</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>внимание: ниво на тъканта</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>нон стоп време</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>грешен номер на събитие</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Не може да бъде създаден разряд за %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Грешка при регистриране на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Грешка при разряд на дата и час</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Гмуркане №%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Грешка при рaзряд на време за гмуркане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Грешка при рaзряд на максимална дълбочина</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Грешка при рaзряд на газ микс брой</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Грешка при прием на водна соленост</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Грешка при прием на повърхностно налягане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Грешка при рaзряд на газ микс</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Грешка при рaзряд на стойности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Събитие: изчаквание на действие от потребителя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Грешка при регистриране на направление за събития</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Грешка при регистриране на направление за отменяне</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Грешка при вход на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Не може да бъде създаден libdivecomputer контекст</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Не може да бъдe отворен %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Неразпозната стойност за проценти %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Не може да бъде напревен разбор на '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Базата данни не може да изпълни get_events. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Базата данни не може да изпълни get_tags. @@ -5107,36 +5162,36 @@ Maximum</source> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Грешка при заява към база данни '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Базата данни не може да изпълни get_cylinders. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Базата данни не може да изпълни get_changes. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Базата данни не може да изпълни get_profile_sample. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Не може да бъде отворен стилов файл %s</translation> </message> @@ -5146,7 +5201,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Не може да бъде намерен газ %s</translation> </message> @@ -5227,55 +5282,60 @@ Maximum</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Консумация на газ:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Предупреждение:</translation> </message> <message> <location filename="../planner.c" line="521"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION 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"/> + <translation>ВНИМАНИЕ: ТОВА Е НОВО ИЗПЪЛНЕНИЕ НА АГЛОРИТЪМА НА БУЛМАН И НА ПЛАНОВИКА, КОИТО НЕ СА ТЕСТВАНИ ДОСТАТЪЧНО. МОЛЯ НЕ ПЛАНУВАЙТЕ ИЗТИНСКИ ГМУРКАНИЯ БАЗИРАНИ НА ДАННИТЕ ТУК!</translation> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>има повече газ от този на разположение в избраната бултилка</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <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="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5284,70 +5344,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбара </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбара </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5356,7 +5416,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5365,14 +5425,14 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Стоп: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Стоп: неопр. време @ %.0f%s @@ -5380,77 +5440,77 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: неопр. време @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>В Deco </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %uмин @ %.0f%s (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>В Deco (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (калк.) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Калкулиран таван %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Тъкан %.0fмин: %.0f%s @@ -5458,51 +5518,51 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>пулс: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>лагер: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d мин</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5622,7 +5682,7 @@ EADD: %d%s <translation>деко</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5672,97 +5732,97 @@ EADD: %d%s <translation>(няма гмуркания)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Нед</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Пон</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Вт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Ср</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Чет</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Пет</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Съб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Ян</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Март</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Юни</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Юли</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Сеп</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Нов</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -5804,22 +5864,22 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../uemis-downloader.c" line="411"/> <source>%s %s</source> - <translation type="unfinished"/> + <translation>%s %s</translation> </message> <message> <location filename="../uemis-downloader.c" line="452"/> <source>divelog #</source> - <translation type="unfinished"/> + <translation>divelog #</translation> </message> <message> <location filename="../uemis-downloader.c" line="454"/> <source>divespot #</source> - <translation type="unfinished"/> + <translation>divespot #</translation> </message> <message> <location filename="../uemis-downloader.c" line="456"/> <source>details for #</source> - <translation type="unfinished"/> + <translation>details for #</translation> </message> <message> <location filename="../uemis-downloader.c" line="650"/> @@ -5986,7 +6046,7 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../save-html.c" line="452"/> <source>Number</source> - <translation type="unfinished"/> + <translation>Номер</translation> </message> <message> <location filename="../save-html.c" line="453"/> @@ -6051,12 +6111,12 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../save-html.c" line="461"/> <source>Trips</source> - <translation type="unfinished"/> + <translation>Пътувания</translation> </message> <message> <location filename="../save-html.c" line="463"/> <source>Advanced search</source> - <translation type="unfinished"/> + <translation>Разширено търсене</translation> </message> <message> <location filename="../save-html.c" line="469"/> @@ -6086,7 +6146,7 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../save-html.c" line="474"/> <source>Show more details</source> - <translation type="unfinished"/> + <translation>Покажи повече детайли</translation> </message> <message> <location filename="../save-html.c" line="477"/> @@ -6106,27 +6166,27 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../save-html.c" line="480"/> <source>Average time</source> - <translation type="unfinished"/> + <translation>Средно време</translation> </message> <message> <location filename="../save-html.c" line="481"/> <source>Shortest time</source> - <translation type="unfinished"/> + <translation>Най-кратко време</translation> </message> <message> <location filename="../save-html.c" line="482"/> <source>Longest time</source> - <translation type="unfinished"/> + <translation>Най-дълго време</translation> </message> <message> <location filename="../save-html.c" line="483"/> <source>Average depth</source> - <translation type="unfinished"/> + <translation>Средна дълбочина</translation> </message> <message> <location filename="../save-html.c" line="484"/> <source>Min depth</source> - <translation type="unfinished"/> + <translation>Мин. дълбочина</translation> </message> <message> <location filename="../save-html.c" line="485"/> @@ -6136,52 +6196,52 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../save-html.c" line="489"/> <source>Average temp</source> - <translation type="unfinished"/> + <translation>Средна темп.</translation> </message> <message> <location filename="../save-html.c" line="490"/> <source>Min temp</source> - <translation type="unfinished"/> + <translation>Мин. темп.</translation> </message> <message> <location filename="../save-html.c" line="491"/> <source>Max temp</source> - <translation type="unfinished"/> + <translation>Макс. темп.</translation> </message> <message> <location filename="../save-html.c" line="492"/> <source>Back to list</source> - <translation type="unfinished"/> + <translation>Назад към списъка</translation> </message> <message> <location filename="../save-html.c" line="498"/> <source>Dive equipment</source> - <translation type="unfinished"/> + <translation>Екипировка</translation> </message> <message> <location filename="../save-html.c" line="501"/> <source>Work pressure</source> - <translation type="unfinished"/> + <translation>Работно налягане</translation> </message> <message> <location filename="../save-html.c" line="502"/> <source>Start pressure</source> - <translation type="unfinished"/> + <translation>Начално налягане</translation> </message> <message> <location filename="../save-html.c" line="503"/> <source>End pressure</source> - <translation type="unfinished"/> + <translation>Крайно налягане</translation> </message> <message> <location filename="../save-html.c" line="511"/> <source>Dive status</source> - <translation type="unfinished"/> + <translation>Статус на гмуркане</translation> </message> <message> <location filename="../save-html.c" line="486"/> <source>Average SAC</source> - <translation type="unfinished"/> + <translation>Средно SAC</translation> </message> <message> <location filename="../save-html.c" line="487"/> @@ -6196,17 +6256,17 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../save-html.c" line="495"/> <source>Dive No.</source> - <translation type="unfinished"/> + <translation>Гмуркане №</translation> </message> <message> <location filename="../save-html.c" line="496"/> <source>Dive profile</source> - <translation type="unfinished"/> + <translation>Гмуркачески профил</translation> </message> <message> <location filename="../save-html.c" line="497"/> <source>Dive information</source> - <translation type="unfinished"/> + <translation>Информация за гмуркане</translation> </message> <message> <location filename="../save-html.c" line="499"/> @@ -6222,7 +6282,7 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../save-html.c" line="504"/> <source>Gas</source> - <translation type="unfinished"/> + <translation>Газ</translation> </message> <message> <location filename="../save-html.c" line="505"/> @@ -6232,17 +6292,17 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../save-html.c" line="507"/> <source>Events</source> - <translation type="unfinished"/> + <translation>Събития</translation> </message> <message> <location filename="../save-html.c" line="508"/> <source>Name</source> - <translation type="unfinished"/> + <translation>Име</translation> </message> <message> <location filename="../save-html.c" line="509"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Стойност</translation> </message> <message> <location filename="../save-html.c" line="510"/> @@ -6272,17 +6332,17 @@ Uemis Zurich включен ли е правилно?</translation> <message> <location filename="../worldmap-save.c" line="43"/> <source>Max depth:</source> - <translation type="unfinished"/> + <translation>Макс. дълбочина</translation> </message> <message> <location filename="../worldmap-save.c" line="46"/> <source>Air temp:</source> - <translation type="unfinished"/> + <translation>Темп. на въздух:</translation> </message> <message> <location filename="../worldmap-save.c" line="48"/> <source>Water temp:</source> - <translation type="unfinished"/> + <translation>Темп. на водата:</translation> </message> <message> <location filename="../worldmap-save.c" line="50"/> @@ -6374,7 +6434,7 @@ Uemis Zurich включен ли е правилно?</translation> <location filename="../qt-ui/plannerSettings.ui" line="275"/> <location filename="../qt-ui/plannerSettings.ui" line="295"/> <source>%</source> - <translation type="unfinished"/> + <translation>%</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="288"/> @@ -6425,7 +6485,7 @@ Uemis Zurich включен ли е правилно?</translation> <location filename="../qt-ui/plannerSettings.ui" line="439"/> <location filename="../qt-ui/plannerSettings.ui" line="452"/> <source>ℓ/min</source> - <translation type="unfinished"/> + <translation>л/мин.</translation> </message> <message> <location filename="../qt-ui/plannerSettings.ui" line="468"/> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index 414496d7e..cc9ddcfde 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -919,57 +931,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Størrelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Arbejdstryk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Start tryk.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Slut tryk.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Skift ved</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Klik her vil fjerne flasken</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Flasken kan ikke fjernes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denne gas er i brug. Kun flasker som ikke bruges i dykket, kan fjernes</translation> </message> @@ -1065,22 +1077,22 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Enheds ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Kaldenavn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Klik her vil fjerne denne dykkercomputer.</translation> </message> @@ -1108,97 +1120,97 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Lokation</translation> </message> @@ -1206,87 +1218,87 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Udvid alt</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Skjul alle</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Saml andre</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Fjern dyk fra tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Opret ny tur over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Tilføj dyk umiddelbart over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Tilføj dyk umiddelbart under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Flet tur med turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Flet tur med turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Slet dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Marker dyk som ugyldige</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Flet valgte dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Gen-Numerer dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Skift tid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Indlæs billeder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Åben billed filer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Billed filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1699,27 +1711,27 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Høje</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Planlagt dykker tid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>ATM tryk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1732,37 +1744,37 @@ fjerne den valgte dykkercomputer?</translation> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Slut dybde</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Brugt gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Drop planen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Du er ved at droppe din plan.</translation> </message> @@ -1784,6 +1796,11 @@ fjerne den valgte dykkercomputer?</translation> <source>Add dive data point</source> <translation>Tilføj punkt</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1882,7 +1899,7 @@ fjerne den valgte dykkercomputer?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1918,127 +1935,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Bedømmelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>fod</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Lokation</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2260,6 +2277,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2268,7 +2298,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2314,8 +2344,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2323,7 +2353,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Position</translation> </message> @@ -2364,27 +2394,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Dyk</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Luft temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Vand temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Noter</translation> </message> @@ -2434,6 +2464,16 @@ p, li { white-space: pre-wrap; } <translation>Gas forbrug</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2506,91 +2546,91 @@ p, li { white-space: pre-wrap; } <translation>Fotos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Flasker </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Tilføj flaske</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Tilføj vægt system</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Gem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Fortryd</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Luft temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Vand temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Turen er ved at blive rettet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Flere dyk bliver rettet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Dette dyk bliver rettet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Tur notater</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Tur lokation</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Dybeste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Laveste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2599,17 +2639,17 @@ blandes fra Luft ved brug: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>og</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Drop ændringerne?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Du er ved at droppe dine ændringer.</translation> </message> @@ -2936,18 +2976,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3131,60 +3170,60 @@ p, li { white-space: pre-wrap; } <translation>Print runtime skema</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vil du gemme ændringerne du foretog på denne fil %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vil du gemme ændringerne du foretog på data filen?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Gem ændringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Gem fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Åben log fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Ændringer vil blive tabt hvis du ikke gemmer dem.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Gem eller fortryd venligst det aktuelle dyk før du åbner en ny fil</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Færdiggør denne rettelse inden du starter på en ny.</translation> </message> @@ -3192,54 +3231,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>f/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Sidste stop på 20f</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Sidste stop på 6 meter</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3754,72 +3793,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Dyk #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Varighed: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Brugt gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Vægt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Noter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Makker:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Dragt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Sigt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -3950,42 +3989,42 @@ p, li { white-space: pre-wrap; } <translation>Naviger på kortet og dobbelt klik for at sætte lokationen</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4266,7 +4305,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4274,17 +4313,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4513,12 +4552,12 @@ OS CPU Arkitektur: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4579,17 +4618,17 @@ OS CPU Arkitektur: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Et klik her vil fjerne dette vægt system.</translation> </message> @@ -4610,79 +4649,79 @@ OS CPU Arkitektur: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>År >Måned / Tur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Varighed Ialt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Længst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4692,29 +4731,29 @@ Gennemsnit</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4722,56 +4761,56 @@ Gennemsnit</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>fod</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>f/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>f/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>pund (lbs)</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>luft</translation> </message> @@ -4802,31 +4841,31 @@ Gennemsnit</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Fejl i læsning af '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimum antal kolonner i CSV import er %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>Ingen</translation> </message> @@ -4834,7 +4873,7 @@ Gennemsnit</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deco stop</translation> </message> @@ -4846,52 +4885,52 @@ Gennemsnit</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>opstigning</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>Loft</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>Arbejdsbyrde</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>Sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>Overtrædelse</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bogmærke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>overflade</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>sikkerhedsstop</translation> </message> @@ -4899,202 +4938,212 @@ Gennemsnit</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>gasskifte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>Sikkerhedsstop (frivillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>Sikkerhedsstop (Krævet)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>dybe stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>Loft (sikkerhedsstop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>Under gulv</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Maks. dybde</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>Lufttid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>Overskrift</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Vævs advarsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>non stop time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>Ugyldigt hændelses nummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Kan ikke oprette parser for %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Fejl i registrering af data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Fejl ved fortolkning af dato/tid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Dyk %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Fejl i fortolkning af dykkertid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Fejl i fortolkning af max dybde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Fejl i fortolkning af antallet af gasser</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Fejl i læsning af saltindhold i vandet</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Fejl ved at opnå overflade tryk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Fejl i fortolkning af gas blanding</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Fejl i fortolkning af prøver</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Fejl: registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Fejl: registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Import fejl i dykker data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Kan ikke danne libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Kan ikke åbne %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation> Mærkelig procent læsning %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Fejl i fortolkning af '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Database forespørgsel get_events fejlede </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Database query get_tags failed. @@ -5108,36 +5157,36 @@ Gennemsnit</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Database forespørgsel fejlede '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Database query get_cylinders failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Database query get_changes failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Database query get_profile_sample failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åbne stylesheet %s</translation> </message> @@ -5147,7 +5196,7 @@ Gennemsnit</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Kan ikke finde gas %s</translation> </message> @@ -5228,15 +5277,20 @@ Gennemsnit</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gas forbrug:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> @@ -5246,37 +5300,37 @@ Gennemsnit</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>det er mere gas end der er tilrådighed i flasken!</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Ikke ekstra gas nok til deling ved opstigning</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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 i planlagt opstigning)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt opstigning) af %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høj pO₂ værdi %.2f at %d:%02u med gas %s på dybde %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5286,7 +5340,7 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s @@ -5294,21 +5348,21 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min @@ -5316,42 +5370,42 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5360,7 +5414,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5369,137 +5423,137 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sikkerhedsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sikkerhedsstop: ukendt tid @ %.0f%s</translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unkn time @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc)</translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>In deko (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (beregn)</translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Beregnet loft %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Væv %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>Hjertefrekvens: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>bærende: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s </translation> @@ -5620,7 +5674,7 @@ EADD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5670,97 +5724,97 @@ EADD: %d%s <translation>(ingen dyk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Søn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Man</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Tir</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Lør</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 0252a9332..d0ad9b2ff 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Grösse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Betriebsdruck</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Anfangsdruck</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Enddruck</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Wechsel bei</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Flasche kann nicht entfernt werden</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen, die nicht im Tauchgang verwendet werden, können entfernt werden.</translation> </message> @@ -1063,22 +1075,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Gerätebezeichnung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Gerätename</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Hier klicken entfernt diesen Tauchcomputer.</translation> </message> @@ -1106,97 +1118,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Ort</translation> </message> @@ -1204,87 +1216,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Entferne Tauchgäng(e) aus Reise</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <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="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <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="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Bilder laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Öffne Bilddateien</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1697,27 +1709,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Meereshöhe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Geplante Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Oberflächendruck</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1730,37 +1742,37 @@ <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Diese Planung verwerfen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Du bist dabei Deinen Plan zu verwerfen.</translation> </message> @@ -1782,6 +1794,11 @@ <source>Add dive data point</source> <translation>Datenpunkt hinzufügen</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1880,7 +1897,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1916,127 +1933,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2258,6 +2275,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2266,7 +2296,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2312,8 +2342,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2321,7 +2351,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Ort</translation> </message> @@ -2362,27 +2392,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Notizen</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Lufttemperatur</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Wassertemperatur</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -2432,6 +2462,16 @@ p, li { white-space: pre-wrap; } <translation>Gasverbrauch</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2504,91 +2544,91 @@ p, li { white-space: pre-wrap; } <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Flaschen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Flasche hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Blei</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Gewichtsystem hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Lufttemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Wassertemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Reisenotizen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Ziel der Reise</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Tiefster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Seichtester Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2597,17 +2637,17 @@ werden aus Luft und </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>und</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Änderungen verwerfen?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation> </message> @@ -2934,18 +2974,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3129,60 +3168,60 @@ p, li { white-space: pre-wrap; } <translation>Zeige Laufzeit Tabelle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Öffne Tauchlog Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <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="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Bitte zuerst die aktuelle Bearbeitung abschliessen um eine neue zu beginnen.</translation> </message> @@ -3190,54 +3229,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20 Fuss</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% mitlerer Tiefe bis 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft bis Oberfläche</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% mitlerer Tiefe bis 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m bis Oberfläche</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3752,72 +3791,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Tauchgang Nr %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Stichworte:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Blei:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -3948,42 +3987,42 @@ p, li { white-space: pre-wrap; } <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4264,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4272,17 +4311,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4508,12 +4547,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4574,17 +4613,17 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Hier klicken entfernt dieses Gewichtssystem.</translation> </message> @@ -4605,79 +4644,79 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Jahr > Monat / Reise</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4687,29 +4726,29 @@ Mittel</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4717,56 +4756,56 @@ Mittel</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>Luft</translation> </message> @@ -4797,31 +4836,31 @@ Mittel</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>keine</translation> </message> @@ -4829,7 +4868,7 @@ Mittel</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>Deko-Stopp</translation> </message> @@ -4841,52 +4880,52 @@ Mittel</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>Nullzeit</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>Aufstieg</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tiefster Deko-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>Arbeit</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>Sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>Verletzung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>Markierung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>Oberfläche</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>Sicherheitsstopp</translation> </message> @@ -4894,202 +4933,212 @@ Mittel</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>Gaswechsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>Sicherheitsstopp (freiwillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>Sicherheitsstopp (obligatorisch)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>Tiefen-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>Sicherheits-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>Tauchgangsdauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>unterhalb Dekotiefe</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Max. Tiefe</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>verbleibende Atemzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>Richtung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Gewebewarnung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>Nullzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>ungültige Ereignisnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Tauchgang %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen der Gasgemischs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Unverständliche Prozentangabe %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Datenbank Anfrage 'get_events' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Datenbank Anfrage 'get_tags' fehlgeschlagen. @@ -5103,36 +5152,36 @@ Mittel</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Datenbank Anfrage fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Datenbank Anfrage 'get_cylinders' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Datenbank Anfrage 'get_changes' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Datenbank Anfrage 'get_profile_sample' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -5142,7 +5191,7 @@ Mittel</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> @@ -5223,15 +5272,20 @@ Mittel</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gasverbrauch:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Warnung:</translation> </message> @@ -5241,37 +5295,37 @@ Mittel</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <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="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserver für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <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="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5280,70 +5334,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5352,7 +5406,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5361,142 +5415,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sicherheitsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sicherheitsstop: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechneter tiefster Deko-Stopp %.0f %s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Gewebe %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>Herzschlag: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> @@ -5616,7 +5670,7 @@ EADD: %d%s <translation>deko</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5666,97 +5720,97 @@ EADD: %d%s <translation>(keine Tauchgänge)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Mo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Fr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mär</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 1f3d2f49e..2277cef57 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -9,16 +9,16 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> - <translation>Keine Tauchpartner</translation> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> + <translation type="unfinished"/> </message> </context> <context> @@ -45,8 +45,8 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> - <translation>Geräte-Einstellungen erfolgreich zurückgesetzt</translation> + <source>Device settings successfully reset</source> + <translation type="unfinished"/> </message> </context> <context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation>Gerät auf die Standardeinstellungen zurücksetzen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation>Erweiterte Einstellungen</translation> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation>60s</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation>Gesamte Tauchzeit</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation>Computermodell</translation> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Größe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Betriebsdruck</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Anfangsdruck</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Enddruck</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Wechsel bei</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Flasche kann nicht entfernt werden</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </message> @@ -1063,22 +1075,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Gerätekennung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Gerätename</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Hier klicken entfernt diesen Tauchcomputer.</translation> </message> @@ -1106,97 +1118,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation>AMV(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Ort</translation> </message> @@ -1204,87 +1216,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Entferne Tauchgäng(e) aus Reise</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <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="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <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="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Zeiten verschieben</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Bilder laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Öffne Bilddateien</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1697,27 +1709,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Meereshöhe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Geplante Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Oberflächendruck</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1730,37 +1742,37 @@ <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Diese Planung verwerfen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Du bist dabei Deinen Plan zu verwerfen.</translation> </message> @@ -1782,6 +1794,11 @@ <source>Add dive data point</source> <translation>Datenpunkt hinzufügen</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1880,8 +1897,8 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> - <translation>Benutzerkennung holen</translation> + <source>Get user ID</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1916,127 +1933,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Bewertung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>AMV</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation>Gewicht(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation>AMV(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Ort</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation>Tiefe(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2258,6 +2275,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2266,8 +2296,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> - <translation>TextLabel</translation> + <source>Text label</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2312,16 +2342,16 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> - <translation>Kein Ort festgelegt</translation> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> + <translation type="unfinished"/> </message> </context> <context> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Ort</translation> </message> @@ -2362,27 +2392,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Notizen</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Wassertemp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -2432,6 +2462,16 @@ p, li { white-space: pre-wrap; } <translation>Gasverbrauch</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2504,91 +2544,91 @@ p, li { white-space: pre-wrap; } <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Flaschen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Flasche hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Blei</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Blei hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Speichern</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Wassertemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Reisenotizen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Ziel der Reise</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Tiefster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Flachster Tauchgang</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2597,17 +2637,17 @@ den folgenden Gasen gemischt werden: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>und</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Änderungen verwerfen?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Sie sind im Begriff, die Änderungen zu Verwerfen.</translation> </message> @@ -2934,8 +2974,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> - <translation>Nach Schlagworten &filtern</translation> + <source>&Filter by tags</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="843"/> @@ -2943,12 +2988,6 @@ p, li { white-space: pre-wrap; } <translation>Strg+F</translation> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/mainwindow.ui" line="390"/> <source>&Print</source> <translation>&Drucken</translation> @@ -3129,60 +3168,60 @@ p, li { white-space: pre-wrap; } <translation>Zeige Laufzeit Tabelle</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Öffne Tauchlog Datei</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <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="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <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> @@ -3190,54 +3229,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Letzter Stopp auf 20 Fuß</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% mitlerer Tiefe bis 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft bis Oberfläche</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Letzter Stopp auf 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% mitlerer Tiefe bis 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m bis Oberfläche</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -3752,72 +3791,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Tauchgang Nr. %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Stichworte:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>AMV:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Blei:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Tauchpartner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -3948,42 +3987,42 @@ p, li { white-space: pre-wrap; } <translation>Karte verschieben und mit Doppelklick Tauchplatz markieren</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4264,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation>Leere Schlagwörter</translation> </message> @@ -4272,17 +4311,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4511,12 +4550,12 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4577,17 +4616,17 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Hier klicken entfernt dieses Gewichtssystem.</translation> </message> @@ -4608,79 +4647,79 @@ Prozessor Architektur (laut Betriebsystem): %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Jahr > Monat / Reise</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>AMV (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4690,29 +4729,29 @@ Durchschnitt</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4720,56 +4759,56 @@ Durchschnitt</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>Luft</translation> </message> @@ -4800,31 +4839,31 @@ Durchschnitt</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>keine</translation> </message> @@ -4832,7 +4871,7 @@ Durchschnitt</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>Deko-Stopp</translation> </message> @@ -4844,52 +4883,52 @@ Durchschnitt</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>Nullzeit</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>Aufstieg</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tiefster Deko-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>Arbeit</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>Sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>Verletzung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>Markierung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>Oberfläche</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>Sicherheitsstopp</translation> </message> @@ -4897,202 +4936,212 @@ Durchschnitt</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>Gaswechsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>Sicherheitsstopp (freiwillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>Sicherheitsstopp (obligatorisch)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>Tiefen-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>Sicherheits-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>Tauchgangsdauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>unterhalb Dekotiefe</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Max. Tiefe</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>verbleibende Atemzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>Richtung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Gewebewarnung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>Nullzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>ungültige Ereignisnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Nicht in der Lage, einen Parser für %s %s zu erstellen</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Tauchgang %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen des Gasgemischs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Unverständliche Prozentangabe %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Datenbank Anfrage 'get_events' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Datenbank Anfrage 'get_tags' fehlgeschlagen. @@ -5106,36 +5155,36 @@ Durchschnitt</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Datenbank Anfrage fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Datenbank Anfrage 'get_cylinders' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Datenbank Anfrage 'get_changes' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Datenbank Anfrage 'get_profile_sample' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -5145,7 +5194,7 @@ Durchschnitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> @@ -5226,15 +5275,20 @@ Durchschnitt</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gasverbrauch:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Warnung:</translation> </message> @@ -5244,37 +5298,37 @@ Durchschnitt</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <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="677"/> + <location filename="../planner.c" line="680"/> <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="679"/> + <location filename="../planner.c" line="682"/> <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 während geplantem Aufstieg)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <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="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5283,70 +5337,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>AMV: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5355,7 +5409,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5364,142 +5418,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sicherheitsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sicherheitsstopp: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: unbek. Zeit @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>In Deko </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>Deko (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berechnet) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Berechneter tiefster Deko-Stopp %.0f %s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Gewebe %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>Herzschlag: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>Peilung: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sTiefe:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sTiefe:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sDruck:%d %s</translation> </message> @@ -5619,7 +5673,7 @@ EADD: %d%s <translation>Deko</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5669,97 +5723,97 @@ EADD: %d%s <translation>(keine Tauchgänge)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Mo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Fr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mär</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index 6211a0606..39f7f4127 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Τύπος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Μέγεθος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Αλλαγή στα</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Πατώντας εδώ θα διαγραφή αυτή η φιάλη.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Η φιάλη δεν μπορεί να διαγραφεί</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1064,22 +1076,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Μοντέλο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>ID Συσκευής</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Όνομα</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1107,97 +1119,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Στολή</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> @@ -1205,87 +1217,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1698,27 +1710,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ <translation>άγνωστο</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Είστε έτοιμοι να απορρίψετε το Πλάνο.</translation> </message> @@ -1783,6 +1795,11 @@ <source>Add dive data point</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Ημερομηνία</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Βαθμός</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Θερμοκρασία</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Βάρος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Στολή</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Τοποθεσία</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Σημειώσεις</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,108 +2545,108 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Φιάλες</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Προσθήκη Φιάλης</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Βάρη</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Προσθήκη Βαρών</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Αποθήκευση</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Το ταξίδι αυτό επεξεργάζεται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Πολλαπλές καταδύσεις επεξεργάζονται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Η κατάδυση επεξεργάζεται αυτή τη στιγμή.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2929,18 +2969,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3124,60 +3163,60 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3185,54 +3224,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3747,72 +3786,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>άγνωστο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Κατάδυση #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Μέγιστο Βάθος: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Διάρκεια: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Βάρη:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Σημειώσεις:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Ζευγάρι:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Στολή:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Ορατότητα:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Βαθμός:</translation> </message> @@ -3943,42 +3982,42 @@ p, li { white-space: pre-wrap; } <translation>Μετακινήστε τον χάρτη και με διπλό κλικ ορίστε την τοποθεσία κατάδυσης</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4259,7 +4298,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4267,17 +4306,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Περιγραφή</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4502,12 +4541,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Περιγραφή</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4568,17 +4607,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Τύπος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Βάρος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation type="unfinished"/> </message> @@ -4599,79 +4638,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Έτος > Μήνας / Ταξίδι</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Συνολική Διάρκεια</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Μέσος Όρος</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Συντομότερο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Μακρύτερο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Μέσο Βάθος (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Ελάχιστο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Μέγιστο</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>Μέσο SAC (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Μέση @@ -4681,29 +4720,29 @@ SAC (%1)</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4711,56 +4750,56 @@ SAC (%1)</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) ή (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>αέρας</translation> </message> @@ -4791,31 +4830,31 @@ SAC (%1)</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Αποτυχία ανάγνωσης '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Μέγιστο αριθμός υποστηριζόμενων στηλών στην εισαγωγή CSV είναι %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>κανένα</translation> </message> @@ -4823,7 +4862,7 @@ SAC (%1)</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>στάση αποσυμπίεσης</translation> </message> @@ -4835,52 +4874,52 @@ SAC (%1)</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>άνοδος</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>ταβάνι</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>φόρτο εργασίας</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>πομπός</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>παράβαση</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>σελιδοδείκτης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>επιφάνεια</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>στάση ασφαλείας</translation> </message> @@ -4888,202 +4927,212 @@ SAC (%1)</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>αλλαγή αερίου</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>στάση ασφαλείας (προληπτική)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>στάση ασφαλείας (υποχρεωτική)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>βαθιά στάση</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>ταβάνι (στάση ασφαλείας)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>διάρκεια</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>below floor</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>μέγιστο βάθος</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>airtime</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>heading</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>προειδοποίηση επιπέδου ιστών</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>non stop time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>άκυρος αριθμός συμβάντος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Αδύνατον να αναλυθεί το %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Σφάλμα στην ημερομηνία</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Κατάδυση %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Σφάλμα στο μέγιστο βάθος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Σφάλμα στον αριθμό των αερίων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Σφάλμα στο μίγμα αερίων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Σφάλμα στα δείγματα</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Σφάλμα στην εισαγωγή δεδομένων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Περίεργο νούμερο ποσοστού %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Σφάλμα στην ανάλυση του '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Σφάλμα στο ερώτημα get_events της βάσης δεδομένων </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> @@ -5096,33 +5145,33 @@ SAC (%1)</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Σφάλμα στο ερώτημα της βάσης δεδομένων '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation> </message> @@ -5132,7 +5181,7 @@ SAC (%1)</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5213,15 +5262,20 @@ SAC (%1)</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5231,232 +5285,232 @@ SAC (%1)</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5576,7 +5630,7 @@ EADD: %d%s <translation>αποσυμπίεση</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation type="unfinished"/> </message> @@ -5626,97 +5680,97 @@ EADD: %d%s <translation>(καμία κατάδυση)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Κυρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Δευ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Τρι</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Τετ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Πεμ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Παρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Σαβ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Ιαν</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Φεβ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Μαρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Απρ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Μαι</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Ιουν</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Ιουλ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Αυγ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Σεπ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Οκτ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Νοε</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Δεκ</translation> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 82f427030..98a5d2c3e 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation>Read settings from backup file or from device before writing to a backup file</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation>OSTC, Mk.2/2N/2C</translation> @@ -409,7 +404,6 @@ <translation>Reset device to default settings</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation>Alt GF can be selected underwater</translation> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation>60s</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation>Computer model</translation> @@ -920,57 +932,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Size</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Work press.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Start press.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>End press.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Switch at</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Clicking here will remove this cylinder.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Cylinder cannot be removed</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>This gas is in use. Only cylinders that are not used in the dive can be removed.</translation> </message> @@ -1066,22 +1078,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Device ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Nickname</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Clicking here will remove this dive computer.</translation> </message> @@ -1109,97 +1121,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Location</translation> </message> @@ -1207,87 +1219,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <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="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <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="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Shift times</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Load images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Open image files</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,27 +1712,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Planned dive time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>ATM pressure</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1733,37 +1745,37 @@ <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Discard the plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>You are about to discard your plan.</translation> </message> @@ -1785,6 +1797,11 @@ <source>Add dive data point</source> <translation>Add dive data point</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1883,7 +1900,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1919,127 +1936,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation>Weight(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Suit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Location</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation>Depth(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2261,6 +2278,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2269,13 +2299,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> <source>Filter this list</source> - <translation type="unfinished"/> + <translation>Filter this list</translation> </message> </context> <context> @@ -2309,14 +2339,14 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Location: </source> - <translation type="unfinished"/> + <translation>Location: </translation> </message> </context> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2324,7 +2354,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Location</translation> </message> @@ -2365,27 +2395,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <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="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <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="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <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="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -2435,6 +2465,16 @@ p, li { white-space: pre-wrap; } <translation>Gas consumption</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2507,91 +2547,91 @@ p, li { white-space: pre-wrap; } <translation>Photos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Cylinders</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Add Cylinder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Weights</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Add Weight System</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Save</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Air temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>This trip is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Multiple dives are being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>This dive is being edited.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Trip notes</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Trip location</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Deepest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Shallowest dive</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2600,17 +2640,17 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation> and </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -2918,7 +2958,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="638"/> <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="811"/> @@ -2937,19 +2977,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> - <translation type="unfinished"/> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> + <translation>Ctrl+F</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="390"/> @@ -3132,60 +3171,60 @@ p, li { white-space: pre-wrap; } <translation>Print runtime table</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <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="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Warning</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <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> @@ -3193,54 +3232,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Last stop at 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft to surface</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m to surface</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -3755,72 +3794,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>unknown</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Dive No. %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Max depth: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Duration: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Gas used:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Tags:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Weights:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Viz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Rating:</translation> </message> @@ -3850,7 +3889,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation> (Tank %1)</translation> </message> <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> @@ -3951,42 +3990,42 @@ p, li { white-space: pre-wrap; } <translation>Move the map and double-click to set the dive location</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4261,13 +4300,13 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="462"/> <source>Tags: </source> - <translation type="unfinished"/> + <translation>Tags: </translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation>Empty Tags</translation> </message> @@ -4275,17 +4314,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4514,12 +4553,12 @@ OS CPU Architecture: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4580,17 +4619,17 @@ OS CPU Architecture: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Weight</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Clicking here will remove this weight system.</translation> </message> @@ -4611,79 +4650,79 @@ OS CPU Architecture: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Year > Month / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>No.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Duration Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Average</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Shortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Longest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Depth (%1) Average</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Average</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4693,29 +4732,29 @@ Maximum</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4723,56 +4762,56 @@ Maximum</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>air</translation> </message> @@ -4803,31 +4842,31 @@ Maximum</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Failed to read '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon import failed: unable to read '%s'</translation> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation>No matching DC found for file '%s'</translation> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximum number of supported columns on CSV import is %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>none</translation> </message> @@ -4835,7 +4874,7 @@ Maximum</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deco stop</translation> </message> @@ -4847,52 +4886,52 @@ Maximum</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>ascent</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>workload</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmitter</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>safety stop</translation> </message> @@ -4900,202 +4939,212 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>gas change</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>safety stop (recommended)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>safety stop (mandatory)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>deep stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>ceiling (safety stop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>divetime</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>below floor</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>maxdepth</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>airtime</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>heading</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>tissue level warning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>no-stop time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>invalid event number</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Unable to create parser for %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Error registering data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Error parsing the date/time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Dive %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Error parsing the divetime</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Error parsing the maxdepth</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Error parsing the gas mix count</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Error obtaining water salinity</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Error obtaining surface pressure</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Error parsing the gas mix</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Strange percentage reading %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Database query get_events failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Database query get_tags failed. @@ -5109,36 +5158,36 @@ Maximum</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Database query failed '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Database query get_cylinders failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Database query get_changes failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Database query get_profile_sample failed. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -5148,7 +5197,7 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> @@ -5229,15 +5278,20 @@ Maximum</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gas consumption:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Warning:</translation> </message> @@ -5247,37 +5301,37 @@ Maximum</translation> <translation>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE BUHLMANN ALGORITHM AND A DIVE PLANNER IMPLEMENTATION 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.</translation> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <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="677"/> + <location filename="../planner.c" line="680"/> <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="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <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="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5286,70 +5340,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5358,7 +5412,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5367,142 +5421,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Safety Stop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Safety Stop: unkn time @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: unkn time @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Calculated ceiling %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tissue %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>heartbeat: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>bearing: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5622,7 +5676,7 @@ EADD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5672,97 +5726,97 @@ EADD: %d%s <translation>(no dives)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Sun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Mon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Tue</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Wed</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Thu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Fri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index a0562480e..dab711d20 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -5,19 +5,19 @@ <message> <location filename="../qt-ui/simplewidgets.cpp" line="487"/> <source>Person: </source> - <translation type="unfinished"/> + <translation>Persona:</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -41,11 +41,11 @@ <message> <location filename="../configuredivecomputer.cpp" line="576"/> <source>Device firmware successfully updated</source> - <translation type="unfinished"/> + <translation>Firmware del dispositivo actualizado con éxito</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -267,7 +267,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="522"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1792"/> <source>Sampling rate</source> - <translation>Ritmo de muestreo</translation> + <translation>Frecuencia de muestreo</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="533"/> @@ -340,22 +340,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/> <source>Read settings from backup file or from device before writing to the device</source> - <translation type="unfinished"/> + <translation>Leer ajustes de un archivo de respaldo o del dispositivo antes de escribir al dispositivo</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/> <source>Read settings from backup file or from device before writing to a backup file</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> + <translation>Leer ajustes de un archivo de respaldo o del dispositivo antes de escribir al dispositivo</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> - <translation type="unfinished"/> + <translation>OSTC, Mk.2/2N/2C</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="466"/> @@ -401,35 +396,44 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="587"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1733"/> <source>Show safety stop</source> - <translation type="unfinished"/> + <translation>Mostrar parada de seguridad</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="597"/> <source>Reset device to default settings</source> - <translation type="unfinished"/> + <translation>Resetear el dispositivo a los ajustes iniciales</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> - <translation type="unfinished"/> + <translation>Ajustes avanzados</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/> <source>Alt GF can be selected underwater</source> + <translation>Alt GF pueden seleccionarse bajo el agua</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> - <translation type="unfinished"/> + <translation>TTS futuro</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/> <source>Pressure sensor offset</source> - <translation type="unfinished"/> + <translation>Offset del sensor de presión</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/> @@ -447,46 +451,46 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/> <source>Decotype</source> - <translation type="unfinished"/> + <translation>Tipo de deco</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/> <source> mbar</source> - <translation type="unfinished"/> + <translation> mbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="769"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1892"/> <source> min</source> - <translation type="unfinished"/> + <translation> min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="783"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1925"/> <source>ZH-L16</source> - <translation type="unfinished"/> + <translation>ZH-L16</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/> <source>ZH-L16+GF</source> - <translation type="unfinished"/> + <translation>ZH-L16+GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="851"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/> <source>Alt GFLow</source> - <translation type="unfinished"/> + <translation>Alt GFBajo</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="858"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2015"/> <source>Alt GFHigh</source> - <translation type="unfinished"/> + <translation>Alt GFAlto</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="865"/> <source>Flip screen</source> - <translation type="unfinished"/> + <translation>Plegar pantalla</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="873"/> @@ -629,22 +633,22 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/> <source>O2 in calibration gas</source> - <translation type="unfinished"/> + <translation>O2 en gas de calibrado</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/> <source>Fixed setpoint</source> - <translation type="unfinished"/> + <translation>Setpoint fijo</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/> <source>Sensor</source> - <translation type="unfinished"/> + <translation>Sensor</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/> <source>Setpoint fallback</source> - <translation type="unfinished"/> + <translation>Setpoint de retorno</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/> @@ -652,29 +656,42 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2323"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/> <source> cbar</source> - <translation type="unfinished"/> + <translation> cbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> + <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> + <source>ppO2 max</source> + <translation>ppO2 max</translation> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> - <translation type="unfinished"/> + <translation>ppO2 min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> <source>Safety level</source> - <translation type="unfinished"/> + <translation>Nivel de seguridad</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1290"/> <source>Altitude range</source> - <translation type="unfinished"/> + <translation>Rango de altura</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1297"/> @@ -685,7 +702,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1317"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1759"/> <source>Number of dives</source> - <translation type="unfinished"/> + <translation>Número de inmersiones</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1377"/> @@ -696,49 +713,44 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P0 (nada)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> <source>P1 (some)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P1 (algo)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> <source>P2 (much)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P2 (mucho)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> - <translation type="unfinished"/> + <translation>Frecuencia de muestreo</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/> <source>20s</source> - <translation type="unfinished"/> + <translation>20s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/> <source>30s</source> - <translation type="unfinished"/> + <translation>30s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/> <source>60s</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> + <translation>60s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> - <translation type="unfinished"/> + <translation>Modelo de ordenador</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1497"/> @@ -749,17 +761,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/> <source>24h</source> - <translation type="unfinished"/> + <translation>24h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/> <source>12h</source> - <translation type="unfinished"/> + <translation>12h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/> <source>Time format</source> - <translation type="unfinished"/> + <translation>Formato de hora</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1539"/> @@ -774,7 +786,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1555"/> <source>s</source> - <translation type="unfinished"/> + <translation>s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1562"/> @@ -784,12 +796,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1579"/> <source>Depth alarm</source> - <translation type="unfinished"/> + <translation>Alarma de profundidad</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/> <source>Time alarm</source> - <translation type="unfinished"/> + <translation>Alarma de tiempo</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1624"/> @@ -799,47 +811,47 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> <source>kg/l</source> - <translation type="unfinished"/> + <translation>kg/l</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> - <translation type="unfinished"/> + <translation>MM/DD/YY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/> <source>DD/MM/YY</source> - <translation type="unfinished"/> + <translation>DD/MM/YY</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/> <source>YY/MM/DD</source> - <translation type="unfinished"/> + <translation>YY/MM/DD</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/> <source>ZH-L16 CC</source> - <translation type="unfinished"/> + <translation>ZH-L16 CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> <source>Apnoe</source> - <translation type="unfinished"/> + <translation>Apnea</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> - <translation type="unfinished"/> + <translation>L16-GF OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/> <source>L16-GF CC</source> - <translation type="unfinished"/> + <translation>L16-GF CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> <source>PSCR-GF</source> - <translation type="unfinished"/> + <translation>PSCR-GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="621"/> @@ -920,57 +932,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Tamaño</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Pres. Trabajo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Pres. Inicio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Pres. Final</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Cambio a </translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Pulsar aquí borrará esta botella</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>La botella no puede borrarse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation> Este gas se está usando. Solo se pueden borrar botellas que no se usen en la inmersión.</translation> @@ -1067,22 +1079,22 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>ID del dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Nombre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Hacer clic aquí borrará este ordenador de buceo.</translation> </message> @@ -1110,97 +1122,97 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation>Lastre(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Traje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Bot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>CNS máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -1208,87 +1220,87 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Contraer todo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Contraer otras</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Borrar inmersión(es) del viaje</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Crear nuevo viaje por encima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Añadir inmersión(es) al viaje de arriba</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Añadir inmersión(es) al viaje de debajo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Combinar viaje con el viaje de encima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Combinar viaje con el viaje de abajo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Borrar inmersión(es)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Marcar inmersión(es) como no válida(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Mezclar las inmersiones seleccionadas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Renumerar inmersiones</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Desplazar horas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Cargar imágenes</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Abrir archivos de imagen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1360,12 +1372,12 @@ el ordenador de buceo seleccionado?</translation> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> <source>DiveShare</source> - <translation type="unfinished"/> + <translation>DiveShare</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>Image depths</source> - <translation type="unfinished"/> + <translation>Profundidad de las imágenes</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> @@ -1445,7 +1457,7 @@ el ordenador de buceo seleccionado?</translation> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="365"/> <source>Light</source> - <translation>Ligero</translation> + <translation>Iluminación</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="370"/> @@ -1480,7 +1492,7 @@ el ordenador de buceo seleccionado?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to dive-share.appspot.com website</source> - <translation type="unfinished"/> + <translation>Enviar los datos de buceo al sitio web dive-share.appspot.com</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> @@ -1495,7 +1507,7 @@ el ordenador de buceo seleccionado?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Write depths of images to file.</source> - <translation type="unfinished"/> + <translation>Escribir la profundidad de las imágenes a archivo.</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> @@ -1531,7 +1543,7 @@ el ordenador de buceo seleccionado?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> <source>Save image depths</source> - <translation type="unfinished"/> + <translation>Guardar profundidades de las imágenes</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> @@ -1701,27 +1713,27 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Altitud</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Fecha/Hora de la inmersión planeada</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Presión atmosférica</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1734,37 +1746,37 @@ el ordenador de buceo seleccionado?</translation> <translation>desconocido</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Profundidad final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Tiempo de ejecución</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gas usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>¿Descartar el plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Está a punto de descartar su plan.</translation> </message> @@ -1786,6 +1798,11 @@ el ordenador de buceo seleccionado?</translation> <source>Add dive data point</source> <translation>Añadir punto de datos de inmersión.</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1837,7 +1854,7 @@ el ordenador de buceo seleccionado?</translation> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>Ambient pressure</source> - <translation type="unfinished"/> + <translation>Presión ambiental</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> @@ -1880,32 +1897,32 @@ el ordenador de buceo seleccionado?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="48"/> <source>⌫</source> - <translation type="unfinished"/> + <translation>⌫</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> <source><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> Not using a UserID means that you will need to manually keep bookmarks to your dives, to find them again.</p></body></html></source> - <translation type="unfinished"/> + <translation><html><head/><body><p><span style=" font-size:20pt; font-weight:600; color:#ff8000;">⚠</span> No usar una UserID significa que necesitarás mantener manualmente marcadores a tus inmersiones para encontrarlas de nuevo.</p></body></html></translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="80"/> <source>Private dives will not appear in "related dives" lists, and will only be accessible if their URL is known.</source> - <translation type="unfinished"/> + <translation>Las inmersiones privadas no aparecerán en las listas de "inmersiones relacionadas" y solo serán accesibles si se conoce su URL.</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="83"/> <source>Keep dives private</source> - <translation type="unfinished"/> + <translation>Mantener las inmersiones privadas</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="105"/> <source>Upload dive data</source> - <translation type="unfinished"/> + <translation>Subir datos de buceo</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> @@ -1914,133 +1931,137 @@ el ordenador de buceo seleccionado?</translation> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.google.com"><span style=" text-decoration: underline; color:#0000ff;">asd</span></a></p></body></html></source> - <translation type="unfinished"/> + <translation><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.google.com"><span style=" text-decoration: underline; color:#0000ff;">asd</span></a></p></body></html></translation> </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Valoración</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Profundidad</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation>Lastre(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Traje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Bot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation>CAS(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>CNS máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Ubicación</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation>Prof.(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Duración</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation>Temp(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2262,6 +2283,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2270,13 +2304,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> <source>Filter this list</source> - <translation type="unfinished"/> + <translation>Filtrar esta lista</translation> </message> </context> <context> @@ -2289,7 +2323,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>Firmware update failed!</source> - <translation type="unfinished"/> + <translation>¡ Ha fallado la actualización de firmware !</translation> </message> <message> <location filename="../configuredivecomputerthreads.cpp" line="1391"/> @@ -2310,14 +2344,14 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Location: </source> - <translation type="unfinished"/> + <translation>Ubicación:</translation> </message> </context> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2325,7 +2359,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -2366,27 +2400,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Notas de la inmersión</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Temperatura del aire</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Temperatura del agua</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -2436,6 +2470,16 @@ p, li { white-space: pre-wrap; } <translation>Consumo de gas</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2508,91 +2552,91 @@ p, li { white-space: pre-wrap; } <translation>Fotos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Botellas</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Añadir botella</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Lastre</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Añadir sistema de lastre</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Guardar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Temp. aire [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Temp. agua [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Este viaje está siendo editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Se están editando varias inmersiones.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Esta inmersión esta siendo editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Notas del viaje</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Ubicación del viaje</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Inmersión más profunda</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Inmersión más superficial</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2601,17 +2645,17 @@ a partir de aire y usando: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>y</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>¿ Descartar los cambios ?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Estás a punto de descartar tus cambios.</translation> </message> @@ -2919,7 +2963,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="638"/> <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="811"/> @@ -2938,19 +2982,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> - <translation type="unfinished"/> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> + <translation>Ctrl+F</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="390"/> @@ -3133,60 +3176,60 @@ p, li { white-space: pre-wrap; } <translation>Imprimir tabla de tiempo de ejecución</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>¿Quieres guardar los cambios realizados en el archivo %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>¿Quieres guardar los cambios que has hecho en el archivo de datos?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>¿Guardar cambios?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Abrir archivo de registro de inmersiones</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Se perderán los cambios si no los guarda.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de abrir otro archivo.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Por favor, termina la edición actual antes de intentar hacer otra.</translation> </message> @@ -3194,54 +3237,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Última parada a 20pies</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>De 50% de prof. media a 20 pies</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>De 20 pies a superficie</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Última parada a 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>De 50% prof. media a 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>De 6m a superficie</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation>pies3/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -3756,72 +3799,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Inmersión n.º %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Profundidad máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Duración: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Gas usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Etiquetas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Lastre:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Compañero:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Traje:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Visibilidad:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Calificación:</translation> </message> @@ -3851,7 +3894,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation>(Botella %1)</translation> </message> <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> @@ -3952,42 +3995,42 @@ p, li { white-space: pre-wrap; } <translation>Mueve el mapa y haz doble click para fijar la posición del buceo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4254,7 +4297,7 @@ p, li { white-space: pre-wrap; } <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> - <translation type="unfinished"/> + <translation>Caja de grupo</translation> </message> </context> <context> @@ -4262,13 +4305,13 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="462"/> <source>Tags: </source> - <translation type="unfinished"/> + <translation>Etiquetas:</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation>Etiquetas vacio</translation> </message> @@ -4276,17 +4319,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Descripción</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4515,12 +4558,12 @@ Arquitectura del SO CPU : %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Descripción</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4581,17 +4624,17 @@ Arquitectura del SO CPU : %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Hacer clic aquí borrará este sistema de lastre</translation> </message> @@ -4612,79 +4655,79 @@ Arquitectura del SO CPU : %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Año > Mes / Viaje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Duración Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Más corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Más larga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Profundidad (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>CAS (%1) Medio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4694,29 +4737,29 @@ Media</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>pie³</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4724,56 +4767,56 @@ Media</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) o (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>aire</translation> </message> @@ -4804,31 +4847,31 @@ Media</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>No se pudo leer «%s»</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> - <translation type="unfinished"/> + <translation>Importación de Poseidon ha fallado: imposible leer '%s'</translation> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> - <translation type="unfinished"/> + <translation>No se ha encontrado concordancia con ningún DC para el archivo '%s'</translation> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>El máximo número de columnas que soporta importar CSV es %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>ninguno</translation> </message> @@ -4836,64 +4879,64 @@ Media</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>parada deco</translation> </message> <message> <location filename="../cochran.c" line="338"/> <source>battery</source> - <translation type="unfinished"/> + <translation>batería</translation> </message> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>ascenso</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>techo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>esfuerzo</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmisor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>violación</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>marcador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>parada de seguridad</translation> </message> @@ -4901,202 +4944,212 @@ Media</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>cambio de mezcla</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>parada de seguridad (voluntaria)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>parada de seguridad (obligatoria)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>parada de profundidad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>techo (parada de seguridad)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>duración de inmersión</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>por debajo del techo</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Profundidad Max</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>tiempo de aire</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>encabezado</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Alarma de nivel de tejidos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tiempo sin parada</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>el número de evento no es válido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>No es posible crear el analizador para %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Error al registrar los datos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Error al analizar la fecha</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Inmersión n.º %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Error al analizar el tiempo de buceo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Error al analizar la máxima profundidad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Error al analizar el conteo de mezcla de gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Error al obtener salinidad del agua</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Error al obtener la presión en superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Error al analizar la mezcla de gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Error al analizar las muestras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Evento: esperando acción del usuario</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), n.º de serie=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Error al registrar el manejador de eventos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Error al registrar el manejador de cancelación</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Error al importar datos de inmersiones</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>No es posible crear el contexto de libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>No se pudo abrir %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Porcentaje extraño al leer %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>No se pudo analizar «%s»</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Falló la petición get_events a la base de datos. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Consulta de la base de datos get_tags falló. @@ -5110,36 +5163,36 @@ Media</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Falló la petición a la base de datos «%s». </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Consulta de la base de datos get_cylinders falló. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Consulta de la base de datos get_changes falló. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Consulta de la base de datos get_profile_sample falló. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>No se puede abrir la hoja de estilo %s</translation> </message> @@ -5149,7 +5202,7 @@ Media</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>No puedo encontrar el gas %s</translation> </message> @@ -5230,15 +5283,20 @@ Media</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Consumo de gas:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Aviso:</translation> </message> @@ -5248,37 +5306,37 @@ Media</translation> <translation>DESCARGO DE RESPONSABILIDAD / AVISO: ESTA ES UNA NUEVA IMPLEMENTACIÓN DEL ALGORITMO BUHLMANN Y UNA IMPLEMENTACIÓN DE UN PLANIFICADOR DE INMERSIÓN BASADO EN ÉL QUE SOLO HA SIDO PROBADA DE FORMA LIMITADA. RECOMENDAMOS FIRMEMENTE NO PLANIFICAR INMERSIONES BASADAS SIMPLEMENTE EN LOS RESULTADOS QUE SE OBTENGAN AQUÍ.</translation> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>!Esto es más gas del disponible en la botella especificada¡</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>¡Reserva insuficiente para compartir gas durante el ascenso!</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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 en el ascenso planeado)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante el ascenso planeado) of %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Valor de pO₂ alto %.2f a %d:%02u con %s a la profundidad de %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5287,70 +5345,70 @@ Prof: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>Pres: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>CAS: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>PMO: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5359,7 +5417,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5368,142 +5426,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Parada de seguridad: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Parada de seguridad: tiempo desc @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Parada deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Parada deco: tiempo desc @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>En deco </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Parada deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>En deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Techo calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tejido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>Ritmo cardiaco: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>Soporte: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sProf:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sProf:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sPres:%d %s</translation> </message> @@ -5623,7 +5681,7 @@ EADD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5673,97 +5731,97 @@ EADD: %d%s <translation>(ninguna inmersión)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Lu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Ma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Ju</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Vi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Ene</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mayo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dic</translation> </message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index 058b181bf..c9e3b7308 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tüüp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Suurus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Töörõhk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Algusrõhk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Lõpurõhk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Vaheta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Siin klikkamine eemaldab selle ballooni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Ballooni ei saa eemaldada</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>See gaas on kasutusel. Eemaldada saab ainult neid balloone, mis pole sellel sukeldumisel kasutusel.</translation> </message> @@ -1064,22 +1076,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Mudel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Seadme ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Hüüdnimi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Siin klikates eemaldate selle sukeldumiskompuutri.</translation> </message> @@ -1107,97 +1119,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Ülikond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Ball</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Asukoht</translation> </message> @@ -1205,87 +1217,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Laienda kõik</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Ahenda kõik kokku</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Ahenda teised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Eemalda sukeldumine/sukeldumised väljasõidust</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Loo uus väljasõit üles</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisa sukeldumine/sukeldumised otse eespool asuvale väljasõidule</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisa sukeldumine/sukeldumised otse allpool asuvale väljasõidule</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Ühenda väljasõit väljasõiduga ülal</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Ühenda väljasõit väljasõiduga all</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Kustuta sukeldumine/sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Märgi sukeldumine/sukeldumised kehtetuks</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Ühenda valitud sukeldumised</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Nummerda sukeldumine/sukeldumised ümber</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Nihuta ajad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Lae pildid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Ava pildifailid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Kõrgus</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Plaanitud sukeldumise aeg</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>ATM rõhk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ <translation>tundmatu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Lõppsügavus</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Töö aeg</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Kasutatud gaas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC seadepunkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Loobu plaanist?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Oled plaanist loobumas.</translation> </message> @@ -1783,6 +1795,11 @@ <source>Add dive data point</source> <translation>Lisa sukeldumise andmepunkt</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Kuupäev</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Hinne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Ülikond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Ball</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Asukoht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>Hapnikumürgistuse ühik (OTU)</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Asukoht</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Sukeldumise märkmed</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Õhu temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Vee temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Märkmed</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation>Gaasi tarbimine</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,91 +2545,91 @@ p, li { white-space: pre-wrap; } <translation>Fotod</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Balloonid</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Lisa balloon</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Raskused</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Lisa raskuste süsteem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Salvesta</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Loobu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Õhu temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Vee temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Seda väljasõitu toimetatakse</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Mitut sukeldumist toimetatakse</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Seda sukeldumist toimetatakse.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Väljasõidu märkmed</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Väljasõidu koht</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Sügavaim sukeldumine</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Madalaim sukeldumine</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2597,17 +2637,17 @@ mixed from Air and using: õhust ja kasutades:</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>ja</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Loobu muudatustest?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Oled muudatustest loobumas.</translation> </message> @@ -2934,18 +2974,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3129,60 +3168,60 @@ p, li { white-space: pre-wrap; } <translation>Väljasta jooksva aja tabel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Kas soovid salvestada muudatused mis tegid faili %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Kas soovid salvestada muudatused mis tegid andmefaili?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Salvesta muudatused?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Ava sukeldumislogi fail</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Muudatusi lähevad kaotsi kui neid ei salvestata.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation> </message> @@ -3190,54 +3229,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>jalg/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Viimane peatus 20 jala peal</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% keskmine sügavus 20 jalani</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20 jalga pinnani</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Viimane peatus 6m peal</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% keskmine sügavus 6m-i</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m pinnani</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3753,72 +3792,72 @@ väärtused</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>tundmatu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Sukeldumine #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Max sügavus: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Kestus: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Kasutatud gaas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Märgendid:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Raskused:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Märkmed:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Semu:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Ülikond:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Nähtavus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Hinne:</translation> </message> @@ -3949,42 +3988,42 @@ väärtused</translation> <translation>Liigu kaardil soovitud kohta ja märgi topeltklikiga sukeldumiskoht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>kuupjalg</translation> </message> @@ -4265,7 +4304,7 @@ väärtused</translation> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4273,17 +4312,17 @@ väärtused</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Kirjeldus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4512,12 +4551,12 @@ OS CPU Arhidektuur: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Kirjeldus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4578,17 +4617,17 @@ OS CPU Arhidektuur: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tüüp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Siin klikkides eemaldatakse raskuste süsteem.</translation> </message> @@ -4609,79 +4648,79 @@ OS CPU Arhidektuur: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Aasta > Kuu / väljasõit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Kestus kokku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Lühim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Pikim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Sügavus (%1) keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Max</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4691,29 +4730,29 @@ Max</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>paskal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>kuupjalg</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4721,56 +4760,56 @@ Max</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>jalg/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>jalga/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) või (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>õhk</translation> </message> @@ -4801,31 +4840,31 @@ Max</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>'%s' lugemine ebaõnnestus</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>CSV impordil on max toetatud veergude arv %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>mitte ükski</translation> </message> @@ -4833,7 +4872,7 @@ Max</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dekopeatus</translation> </message> @@ -4845,52 +4884,52 @@ Max</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>tõus</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>lagi</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>töökoormus</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>saatja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>rikkumine</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>järjehoidja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>pind</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>ohutuspeatus</translation> </message> @@ -4898,202 +4937,212 @@ Max</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>gaasivahetus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>ohutuspeatus (vabatahtlik)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>ohutuspeatus (kohustuslik)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>sügavpeatus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>lagi (ohutuspeatus)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>põhjaaeg</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>allpool taset</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>max sügavus</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>Hapnikulimiidi osa (OLF)</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>aeg õhuga</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>suund</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>koe taseme hoiatus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>mittepeatuste aeg</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>vale sündmuse nr</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Ei saa luua parserit %s %s jaoks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Viga andmete registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Viga kuupäeva ja aja tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Sukeldumine %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Viga põhjaaja tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Viga max sügavuse tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Viga gaasisegude arvu tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Viga vee soolsuse saamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Viga pinnarõhu saamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Viga gaasisegu tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Viga proovide tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Sündmus: ootan kasutaja sekkumist</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>mudel=%u (0x%08x), püsivara=%u (0x%08x), seerianr=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Viga sündmuste draiveri registreerimisel.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Viga tühistamise draiveri registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Viga sukeldumise andmete impordil</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Ei saa luua libdivecomputer konteksti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Ei saa avada %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Imelik protsendilugem %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>'%s' tuvastamine ebaõnnestus</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Andmebaasi päring get_events ebaõnnestus. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Andmebaasi päring get_tags ebaõnnestus. @@ -5107,36 +5156,36 @@ Max</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Andmebaasi päring ebaõnnestus '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Andmebaasi päring get_cylinders ebaõnnestus. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Andmebaasi päring get_changes ebaõnnestus. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Andmebaasi päring get-profile_sample ebaõnnestus. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Ei suuda avada stiililehte &s</translation> </message> @@ -5146,7 +5195,7 @@ Max</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Ei leia gaasi %s</translation> </message> @@ -5227,15 +5276,20 @@ Max</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gaasi tarbimine:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Hoiatus:</translation> </message> @@ -5245,37 +5299,37 @@ Max</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>gaasi hulk on suurem kui määratud balloonis võimalik!</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pole piisavalt reservi gaasi jagamiseks tõusul!</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s-st (%.0f%s/%.0f%s planeeritud tõusul)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s planeeritud tõusu jooksul) %s-st</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>kõrge pO₂ väärtus %.2f %d:%02u peal gaasiga %s sügavusel %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5284,70 +5338,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5356,7 +5410,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5365,137 +5419,137 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Ohutuspeatus: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Ohutuspeatus: teadmata aeg @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: teadmata aeg @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>Dekos </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (arvutatud)</translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>Dekos (arvutatud) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (arvutatud)</translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (arvutatud)</translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Arvutatud lagi %.0f%s</translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Kude %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>Pulss: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>Kurss: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5615,7 +5669,7 @@ EADD: %d%s <translation>deko</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5665,97 +5719,97 @@ EADD: %d%s <translation>(pole sukeldumisi)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Pühap</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Esmasp</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Teisip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Kolmap</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Neljap</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Reede</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Laup</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jaan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Veebr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Märts</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Juuni</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Juuli</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sept</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dets</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index 97478a509..8c53ef8fe 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tyyppi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Tilavuus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Paineluokka</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Alkupaine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Loppupaine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Vaihda syvyydessä</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Poista säiliö.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Säiliötä ei voida poistaa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation> </message> @@ -1064,22 +1076,22 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Malli</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Laite ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Lempinimi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Poista sukellustietokone.</translation> </message> @@ -1107,97 +1119,97 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Säiliöt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Kohde</translation> </message> @@ -1205,87 +1217,87 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Laajenna kaikki retket</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Supista kaikki retket</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Tiivistä muut</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Erota sukellukset retkestä</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Liitä uuteen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisää sukellukset yläpuoliseen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisää sukellukset alapuoliseen retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Liitä retki yllä olevaan retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Liitä retki alla olevaan retkeen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Poista sukellukset</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Merkitse sukellukset epäkelvoiksi</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Uhdistä valitut sukellukset</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Numeroi uudelleen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Muuta aikoja</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Lataa kuvat</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Avaa kuvatiedostot</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Korkeus</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Suunniteltu sukelluksen kesto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Ilmanpaine</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ poistaa valitun sukellustietokoneen?</translation> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Lopullinen syvyys</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Käytetty kaasuseos</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CCR-asetuspiste</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Hylätäänkö suunnitelma?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Olet hylkäämässä suunnitelmasi.</translation> </message> @@ -1783,6 +1795,11 @@ poistaa valitun sukellustietokoneen?</translation> <source>Add dive data point</source> <translation>Lisää sukellusetappi</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ poistaa valitun sukellustietokoneen?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Ajankohta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Yleisarvio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Lämpötila</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Puku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Säiliöt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Kohde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Kohde</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Muistiinpanot</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Ilman lämpötila</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Veden lämpötila</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation>Kaasun kulutus</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,91 +2545,91 @@ p, li { white-space: pre-wrap; } <translation>Valokuvat</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Säiliöt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Lisää säiliö</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Lisää painojärjestelmä</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Tallenna</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Ilman lämpötila [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Veden lämpötila [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Tätä sukellusretkeä muokataan.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Muokataan useita sukelluksia.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Tätä sukellusta muokataan.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Matkan muistiinpanot</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Matkakohde</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Syvin sukellus</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Matalin sukellus</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2598,17 +2638,17 @@ sekoittaa ilmasta ja käyttäen: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>ja</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Hylätäänkö muutokset?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Olet hylkäämässä muutoksesi.</translation> </message> @@ -2935,18 +2975,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3130,60 +3169,60 @@ p, li { white-space: pre-wrap; } <translation>Tulosta sukellussuunnitelma</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Avaa sukellusloki</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Muutokset hylätään, jos et tallenna niitä.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Varoitus</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation> </message> @@ -3191,54 +3230,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Viimeinen pysähdys 20 jalassa</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% keskisyvyydestä - 20 jalkaan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20 jalasta pintaan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Viimeinen pysähdys kuudessa metrissä</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% keskisyvyydestä - 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m:stä pintaan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3754,72 +3793,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Sukellus #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Suurin syvyys: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Kesto: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Kaasun kulutus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Avainsanat:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>Pintakulutus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Painot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Muistiinpanot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Sukellusvanhin:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Sukelluspari:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Puku:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Näkyvyys:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Yleisarvio:</translation> </message> @@ -3950,42 +3989,42 @@ p, li { white-space: pre-wrap; } <translation>Kaksoisnäpäytä karttaa valitaksesi sukelluskohteen</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -4266,7 +4305,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4274,17 +4313,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Kuvaus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4512,12 +4551,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Kuvaus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4578,17 +4617,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tyyppi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Poista painojärjestelmä.</translation> </message> @@ -4609,79 +4648,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Vuosi > Kuukausi / Retki</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Kesto Kokonais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Keskim.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Lyhin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Pisin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Dyvyys (%1) Keski</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Alin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Suurin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Keski</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Lämpö (%1) @@ -4691,29 +4730,29 @@ Keski</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4721,56 +4760,56 @@ Keski</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) tai (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>ilma</translation> </message> @@ -4801,31 +4840,31 @@ Keski</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Tiedoston '%s' avaaminen epäonnistui</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>ei mitään</translation> </message> @@ -4833,7 +4872,7 @@ Keski</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deko-pysähdys</translation> </message> @@ -4845,52 +4884,52 @@ Keski</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>pohja-aika</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>nousu</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>katto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>työmäärä</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>lähetin</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>rike</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>kirjanmerkki</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>pinta</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>turvapysähdys</translation> </message> @@ -4898,202 +4937,212 @@ Keski</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>Kaasun vaihto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>turvapysähdys (vapaaehtoinen)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>turvapysähdys (pakollinen)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>syväpysähdys</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>katto (turvapysähdys)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>sukellusaika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>liian syvällä</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Suurin syvyys</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>Happikertymä</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>Ilma-aika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>suunta</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>kudoskertymän varoitus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>keskeytyksetön aika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>tuntematon tapahtumanumero</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Jäsentäjän luominen %s %s epäonnistui</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Virhe tiedon rekisteröinnissä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Virhe ajan jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Sukellus %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Virhe sukelluksen keston jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Virhe maksimisyvyyden jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Virhe kaasuseosten määrän jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Virhe veden suolapitoisuuden määrityksessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Virhe ilmanpaineen määrityksessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Virhe kaasuseoksen jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Virhe näytteiden tulkinnassa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Tapahtuma: odotetaan käyttäjän toimia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>malli=%u (0x%08x), firmware=%u (0x%08x), sarjanumero=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Virhe sukellusten jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Avaaminen epäonnistui: %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Outo prosenttiosuus: %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Tiedoston '%s' lukeminen epäonnistui.</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Tietokantakysely 'get_events' (nouda tapahtumat) epäonnistui. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Tietokantakysely 'get_tags' epäonnistui. @@ -5107,36 +5156,36 @@ Keski</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Tietokantakysely epäonnistui '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Tietokantakysely 'get_cylinders' epäonnistui. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Tietokantakysely 'get_changes' epäonnistui. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Tietokantakysely 'get_profile_sample' epäonnistui. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Tyylitiedoston %1 avaus ei onnistu</translation> </message> @@ -5146,7 +5195,7 @@ Keski</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Seosta %s ei löydy</translation> </message> @@ -5228,16 +5277,21 @@ Keski</translation> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Kaasun kulutus: </translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Varoitus:</translation> </message> @@ -5247,37 +5301,37 @@ Keski</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>tämä on enemmän kaasua kuin sinulla on määritellyissä säiliöissä!</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>sinulla ei ole tarpeeksi kaasua jakaaksesi sitä pintaan nousun ajan!</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s / %s (%.0f%s/%.0f%s suunnitellussa nousussa)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s suunnitellun nousun aikana) / %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>korkea pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5286,70 +5340,70 @@ S: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>L: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>N: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5358,7 +5412,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5367,141 +5421,141 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Turvapysähdys: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Turvapysähdys: ajankohta? @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: ajankohta? @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>Dekossa</translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (lask.) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>Dekossa (lask.) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Laskettu katto %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Kudos %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>syke: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>suunta: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sA: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sS:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sS:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sN:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sN:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5621,7 +5675,7 @@ EADD: %d%s <translation>deko</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5671,97 +5725,97 @@ EADD: %d%s <translation>(ei sukelluksia)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>su</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>ma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>ti</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>ke</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>to</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>pe</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>la</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>tammi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>helmi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>maalis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>huhti</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>touko</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>kesä</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>heinä</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>elo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>syys</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>loka</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>marras</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>joulu</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 263ef956f..86f6f89cf 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,8 +45,8 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> - <translation>Les paramètres de l'ordinateur ont été réinitialisés avec succès</translation> + <source>Device settings successfully reset</source> + <translation type="unfinished"/> </message> </context> <context> @@ -348,11 +348,6 @@ <translation>Lire les paramètres du fichier de sauvegarde ou de l'ordinateur avant d'écrire dans un fichier de sauvegarde</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation>Famille du Suunto Vyper</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation>OSTC, Mk.2/2N/2C</translation> @@ -409,7 +404,6 @@ <translation>Rétablir les paramètres par défaut sur l'ordinateur </translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation>Réglages Avancés</translation> @@ -421,6 +415,16 @@ <translation>GF alternatifs sélectionnables sous l'eau</translation> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation>ppO2 max</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation>ppO2 min</translation> @@ -731,11 +748,6 @@ <translation>60s</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation>Temps total de plongée</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation>Modèle d'ordinateur</translation> @@ -919,57 +931,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Taille</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Pression de service</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Pression initiale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Pression finale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Changement à</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Cliquer ici retirera ce bloc.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Le bloc ne peut être retiré.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <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> @@ -1065,22 +1077,22 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modèle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Identifiant du périphérique</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Nom</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Cliquer ici enlèvera cet ordinateur</translation> </message> @@ -1108,97 +1120,97 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation>Profondeur(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation>Température(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation>Poids(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Combinaison</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Blk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>SNC max</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Lieu</translation> </message> @@ -1206,87 +1218,87 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Tout déplier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Tout replier</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Replier les autres</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Supprimer la (les) plongée(s) du voyage</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Créer un nouveau groupe au-dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Ajouter la(les) plongée(s) au voyage immédiatement au dessus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Ajouter la (les) plongée(s) au voyage immédiatement ci-dessous</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <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="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <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="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Effacer la (les) plongée(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Invalider la (les) plongée(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Fusionner les plongées sélectionnées</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Renuméroter les plongées</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Heure de changement</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Charger les images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Ouvrir les fichiers images</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Fichier image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,27 +1712,27 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Durée de plongée planifiée</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Pression atmosphérique</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1733,37 +1745,37 @@ l'ordinateur de plongée sélectionné ?</translation> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Profondeur finale</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Temps de fonctionnement</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gaz utilisé</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC (recycleur) Set Point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Abandonner le plan ?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Vous allez annuler la planification.</translation> </message> @@ -1785,6 +1797,11 @@ l'ordinateur de plongée sélectionné ?</translation> <source>Add dive data point</source> <translation>Ajouter un point de donnée</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1883,7 +1900,7 @@ l'ordinateur de plongée sélectionné ?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1919,127 +1936,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Évaluation</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Profondeur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>Consommation d'air</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation>Poids(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Combinaison</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Blk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation>Gaz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>SNC max</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Lieu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation>Profondeur(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Durée</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation>Température(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2261,6 +2278,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2269,7 +2299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2315,8 +2345,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2324,7 +2354,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Lieu</translation> </message> @@ -2365,27 +2395,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Notes de plongée</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Température de l'air</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Température de l'eau</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -2435,6 +2465,16 @@ p, li { white-space: pre-wrap; } <translation>Consommation de gaz</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2507,91 +2547,91 @@ p, li { white-space: pre-wrap; } <translation>Photos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Blocs</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Ajouter un bloc</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Ajouter un système de poids</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Sauvegarder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Température de l'air. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Température de l'eau. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Ce voyage est en train d'être édité.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <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="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <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="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Info sur le voyage</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Lieu du voyage</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Plongée la plus profonde</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Plongée la moins profonde</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2600,17 +2640,17 @@ mélangés à partir de l'air avec: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>et</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Abandonner les modifications ?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Vous perdrez les modifications non enregistrées.</translation> </message> @@ -2937,18 +2977,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3132,60 +3171,60 @@ p, li { white-space: pre-wrap; } <translation>Imprimer le runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Enregistrer les modifications?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Ouvrir un journal de plongée</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <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="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <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> @@ -3193,54 +3232,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Dernier palier à 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft à la surface</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Dernier palier à 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>de 50% de la profondeur moyenne à 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m à la surface</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -3755,72 +3794,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Plongée n°%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Profondeur max: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Durée: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Gaz utilisé:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Étiquettes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>Consommation d'air:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Poids:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Chef de palanquée:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Binôme:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Combinaison:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Visi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Évaluation:</translation> </message> @@ -3951,42 +3990,42 @@ p, li { white-space: pre-wrap; } <translation>Déplacez la carte et double cliquez pour définir le lieu de la plongée</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>pied³</translation> </message> @@ -4267,7 +4306,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4275,17 +4314,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4515,12 +4554,12 @@ Architecture OS CPU: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4581,17 +4620,17 @@ Architecture OS CPU: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Cliquer ici retirera ce système de poids.</translation> </message> @@ -4612,79 +4651,79 @@ Architecture OS CPU: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Année > Mois / Groupe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Durée Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Plus courte</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Plus longue</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Pronfondeur (%&) Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>Consommation d'air (%1) Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4694,29 +4733,29 @@ Moyenne</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>pied³</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4724,56 +4763,56 @@ Moyenne</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>air</translation> </message> @@ -4804,31 +4843,31 @@ Moyenne</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Impossible de lire « %s »</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Le nombre maximum de colonnes supporté pour les importations de fichiers CSV est %d.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>aucun</translation> </message> @@ -4836,7 +4875,7 @@ Moyenne</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>Arrêt de décompression</translation> </message> @@ -4848,52 +4887,52 @@ Moyenne</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>ascension</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>plafond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>charge</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmetteur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>signet</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>palier de sécurité</translation> </message> @@ -4901,202 +4940,212 @@ Moyenne</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>Changement de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>palier de sécurité (volontaire)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>palier de sécurité (obligatoire)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>Arrêt profond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>plafond (palier de sécurité)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>Temps de plongée</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>sous profondeur plancher</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>profondeur max</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>temps d'air</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>entête</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Avertissement de niveau « tissue »</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>temps sans arrêt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>numéro d'événement non valide</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Impossible de créer une analyse pour %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Impossible d'enregistrer les données</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Impossible d'analyser l'heure</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Plongée n°%d - %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Impossible d'analyser le temps de plongée</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Impossible d'analyser la profondeux maximale</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Impossible d'analyser le nombre de mélange gazeux</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Impossible d'obtenir la salinité de l'eau</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Erreur à l'obtention de la pression en surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Impossible d'analyser le mélange gazeux</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Impossible d'analyser des échantillons</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Événement : attente d'une action de l'utilisateur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modèle = %u (0x%08x), firmware = %u (0x%08x), port série = %u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Impossible d'enregistrer le gestionnaire d'événement.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Impossible d'enregistrer le gestionnaire d'annulation.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Erreur à l'import des données de plongées</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Impossible d'ouvrir %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Valeur de pourcentage étrange %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Impossible d'analyser « %s »</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Échec de la requête get_events. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Échec de la requête get_tags. @@ -5110,36 +5159,36 @@ Moyenne</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Échec de la requête '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Échec de la requête get_cylinders. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Échec de la requête get_changes. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Échec de la requête get_profile_sample. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Impossible d'ouvrir le feuille de style %s</translation> </message> @@ -5149,7 +5198,7 @@ Moyenne</translation> <translation>Nitrox%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Ne peut pas trouver le gaz %s</translation> </message> @@ -5230,15 +5279,20 @@ Moyenne</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Consommation de gaz:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Avertissement:</translation> </message> @@ -5248,37 +5302,37 @@ Moyenne</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>C'est plus de gaz que ce qui est disponible dans le bloc spécifié!</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pas assez de gaz en réserve pour un échange lors de la remontée</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s de %s (%.0f%s/%.0f%s dans la remontée planifiée)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durant la remontée planifiée) de %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valeur pO₂ haute %.2f à %d:%02u avec le gaz %s à la profondeur %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5287,70 +5341,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>Consommation d'air en surface : %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>SNC : %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5359,7 +5413,7 @@ PEDA : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5368,70 +5422,70 @@ PEDA : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Arrêt de sécurité: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Arrêt de sécurité: temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Déco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Déco: temps inconnu @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>Déco </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>LND : %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>DTR: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Déco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>Déco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>LND:%umin (calc) @@ -5439,72 +5493,72 @@ PEDA : %d%s </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TRS:%umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Plafond calculé %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tissue %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>rythme cardiaque: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>palié: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sPd:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sPd:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5624,7 +5678,7 @@ PEDA : %d%s <translation>décompression</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5674,97 +5728,97 @@ PEDA : %d%s <translation>(pas de plongées)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Dim.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Lun.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Mer.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Jeu.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Ven.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sam.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Janv.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Fév.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Avril</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Juin</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Juil.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Août</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sept.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Oct.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov.</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Déc.</translation> </message> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index 46c7c0db5..f7ad53f7b 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>סוג</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>גודל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1063,22 +1075,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>דגם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>מזהה התקן</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>כינוי</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1106,97 +1118,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>חליפה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>מיקום</translation> </message> @@ -1204,87 +1216,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1697,27 +1709,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>מטר</translation> </message> @@ -1730,37 +1742,37 @@ <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>אזהרה, אתם עומדים למחוק תוכנית צלילה.</translation> </message> @@ -1782,6 +1794,11 @@ <source>Add dive data point</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1880,7 +1897,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1916,127 +1933,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>דירוג</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>טמפ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>משקל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>חליפה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>מיקום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2258,6 +2275,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2266,7 +2296,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2312,8 +2342,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2321,7 +2351,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>מיקום</translation> </message> @@ -2362,27 +2392,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>הערות</translation> </message> @@ -2432,6 +2462,16 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2504,108 +2544,108 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>מיכלים</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>הוסף מיכל</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>משקולות</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>הוסף מערכת משקולות</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>שמור</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>בטל</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>צלילות מרובות בעריכה.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>צלילה זו בעריכה.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2928,18 +2968,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3123,60 +3162,60 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>אזהרה</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3184,54 +3223,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3746,72 +3785,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>צלילות מס %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>עומק מקסימלי: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>זמן: %1 דקות</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>צריכת אויר:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>משקולות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>הערות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>מדריך צלילה:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>בן זוג:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>חליפה:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>ראות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>דירוג</translation> </message> @@ -3942,42 +3981,42 @@ p, li { white-space: pre-wrap; } <translation>תזיז את המפה ולחץ לחיצה כפולה כדי לקבוע את מיקום הצלילה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>ליברה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4258,7 +4297,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4266,17 +4305,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>תיאור</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>מ"ל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4501,12 +4540,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>תיאור</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>קילוגרם</translation> </message> @@ -4567,17 +4606,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>סוג</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>משקל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation type="unfinished"/> </message> @@ -4598,79 +4637,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>שנה > חודש / טיול</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>משך כולל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> קצר ביותר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> ארוך ביותר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>עומק (%1) ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> מינימום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> מקסימום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>צריכת אויר (%1) ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>טמפ' (%1) @@ -4680,29 +4719,29 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>פסקל</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4710,56 +4749,56 @@ Maximum</source> <translation>מטר</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%S) או (%S)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>אוויר</translation> </message> @@ -4790,31 +4829,31 @@ Maximum</source> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>קריאה מ'%S' נכשלה</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>אין</translation> </message> @@ -4822,7 +4861,7 @@ Maximum</source> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>עצירה לדיקומפרסיה</translation> </message> @@ -4834,52 +4873,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>זמן נותר בעומק</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>עליה</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>תקרה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>עומס</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>משדר</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>חריגה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>סימניה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>שטח</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>עצירת בטיחות</translation> </message> @@ -4887,201 +4926,211 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>החלפת גז</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>עצירת בטיחות (יזומה)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>עצירת בטיחות (חובה)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>עצירה בעומק</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>תקרה (עצירת בטיחות)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>זמןצלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>עומק מקס'</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>זמן אויר</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>כותרת</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>אזהרת רמות רקמות</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>זמן ללא עצירה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>מס' ארוע שגוי</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>לא מצליח להבין %s %s </translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>שגיאה ברישום המידע</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>שגיאה בקריאת תאריך</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>שגיאה בקריאת זמן צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>שגיאה בקריאת עומק מקסימלי</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>שגיאה בקריאת תערובת גזים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>שגיאה בקבלת מליחות מים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>שגיאה בקבלת לחץ על פני המים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>שגיאה בקריאת תערובת הגזים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>שגיאה בקריאת נקודות דגימה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>אירוע: מחכה לפעולה של המשתמש</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>דגם=%u (0x%08x), הקושחה=%u (0x%08x), מספר סידורי=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>שגיאה ברישום שגרת ניהול</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>שגיאת יבוא נתוני צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>לא ניתן לפתוח את %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>שאילתת מסד נתונים של Get_events נכשל </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> @@ -5094,33 +5143,33 @@ Maximum</source> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>שאילתת מסד נתונים נכשל '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation> </message> @@ -5130,7 +5179,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5211,15 +5260,20 @@ Maximum</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5229,233 +5283,233 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>רעילות שייורית מקסימלית %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>פעימות לב %d</translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5575,7 +5629,7 @@ EADD: %d%s <translation>דקומפרסיה</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation type="unfinished"/> </message> @@ -5625,97 +5679,97 @@ EADD: %d%s <translation>(שום צלילות)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>ראשון</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>שני</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>שלישי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>רביעי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>חמישי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>שישי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>שבת</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>ינואר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>פבואר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>מרץ</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>אפריל</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>מאי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>יוני</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>יולי</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>אוגוסט</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>ספטמבר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>אוקטובר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>נובמבר</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>דצמבר</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 72a9728f7..14a8f2ce1 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Vrsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Veličina</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1063,22 +1075,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Naziv uređaja</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1106,97 +1118,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Boca</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -1204,87 +1216,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Otvori sve</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Zatvori sve grupe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Kreiraj novu grupu iznad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Spoji s grupom iznad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Spoji s grupom ispod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1697,27 +1709,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1730,37 +1742,37 @@ <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -1782,6 +1794,11 @@ <source>Add dive data point</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1880,7 +1897,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1916,127 +1933,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Ocjena</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Odijelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Boca</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Lokacija</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2257,6 +2274,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2265,7 +2295,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2311,8 +2341,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2320,7 +2350,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -2361,27 +2391,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Bilješke</translation> </message> @@ -2431,6 +2461,16 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2503,108 +2543,108 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Boce</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2927,18 +2967,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3122,60 +3161,60 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3183,54 +3222,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3745,72 +3784,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -3941,42 +3980,42 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4257,7 +4296,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4265,17 +4304,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4500,12 +4539,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4566,17 +4605,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Vrsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation type="unfinished"/> </message> @@ -4597,70 +4636,70 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -4669,29 +4708,29 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4699,56 +4738,56 @@ Maximum</source> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) ili (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>zrak</translation> </message> @@ -4779,31 +4818,31 @@ Maximum</source> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Nije uspjelo čitanje '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>nijedan</translation> </message> @@ -4811,7 +4850,7 @@ Maximum</source> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deko zastoj</translation> </message> @@ -4823,52 +4862,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>izron</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>strop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>opterećenje</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>odašiljač</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>povreda</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>površina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>sigurnosna stanka</translation> </message> @@ -4876,202 +4915,212 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>promjena plina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>sigurnosna stanka (opcionalna)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>sigurnosna stanka (obavezna)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>dubinska stanka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>strop (sigurnosni zastoj)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>trajanje urona</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Max dubina</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>preostalo trajanje zraka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>kurs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>upozorenje tkivo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>non stop vrijeme</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>neispravan broj događaja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Ne mogu kreirati parser za %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Greška pri registraciji podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Greška pri parsiranju datuma i vremena</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Greška pri parsiranju vremena urona</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Greška pri parsiranju maksimalne dubine</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Greška pri parsiranju broja mješavina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Greška pri dohvaćanju saliniteta vode</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Greška pri parsiranju mješavine plinova</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Neobično očitanje postotka %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Nije uspjelo parsiranje '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Neuspjeo get_events na bazi. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> @@ -5084,33 +5133,33 @@ Maximum</source> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Neuspjeo upit na bazu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5120,7 +5169,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5201,15 +5250,20 @@ Maximum</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5219,231 +5273,231 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> @@ -5563,7 +5617,7 @@ EADD: %d%s <translation>deko</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation type="unfinished"/> </message> @@ -5613,97 +5667,97 @@ EADD: %d%s <translation>(nema urona)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Ned</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Uto</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Sri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Čet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Pet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sub</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Sij</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Velj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Ožu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Tra</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Svi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Lip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Srp</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Kol</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Ruj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Lis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Stu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Pro</translation> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index 551397fb5..2221691fd 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1063,22 +1075,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Típús</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1106,97 +1118,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Pal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Hely</translation> </message> @@ -1204,87 +1216,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Mind kinyit</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Összes összecsukása</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Túra létrehozása fentebb</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Túra egyesítése a fentivel</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Túra egyesítése a lentivel</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1697,27 +1709,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation type="unfinished"/> </message> @@ -1730,37 +1742,37 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -1782,6 +1794,11 @@ <source>Add dive data point</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1880,7 +1897,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1916,127 +1933,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Pal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Hely</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation type="unfinished"/> </message> @@ -2257,6 +2274,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2265,7 +2295,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2311,8 +2341,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2320,7 +2350,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Hely</translation> </message> @@ -2361,27 +2391,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation type="unfinished"/> </message> @@ -2431,6 +2461,16 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2503,108 +2543,108 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Palackok</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Ment</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2927,18 +2967,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3122,60 +3161,60 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3183,54 +3222,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3745,72 +3784,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -3941,42 +3980,42 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation type="unfinished"/> </message> @@ -4257,7 +4296,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4265,17 +4304,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation type="unfinished"/> </message> @@ -4500,12 +4539,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation type="unfinished"/> </message> @@ -4566,17 +4605,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation type="unfinished"/> </message> @@ -4597,70 +4636,70 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -4669,29 +4708,29 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4699,56 +4738,56 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) vagy (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation type="unfinished"/> </message> @@ -4779,31 +4818,31 @@ Maximum</source> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>'%s' olvasása meghiúsult.</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation type="unfinished"/> </message> @@ -4811,7 +4850,7 @@ Maximum</source> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation type="unfinished"/> </message> @@ -4823,52 +4862,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation type="unfinished"/> </message> @@ -4876,200 +4915,210 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Hiba az adat regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Hiba a dátumidő feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Hiba a merülési idő feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Hiba a max mélység feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Hiba gáz keverék számítás feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Hiba a víz sótartalmának lekérdezésekor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Hiba a gáz keverék feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Hiba a minták feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Esemény: várakozás a felhasználóra</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Hiba az esemény kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Hiba a visszavonás kezelő regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Merülési adat importálási hiba</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>'%s' értelmezése meghiúsult.</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> @@ -5081,32 +5130,32 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5116,7 +5165,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5197,15 +5246,20 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5215,231 +5269,231 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> @@ -5559,7 +5613,7 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation type="unfinished"/> </message> @@ -5609,97 +5663,97 @@ EADD: %d%s <translation>(nincs merülés)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>H</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>P</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Már</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Ápr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jún</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Júl</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 1f8d63599..8f92c553c 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tipe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Ukuran</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1063,22 +1075,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>ID Perangkat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Nama Panggilan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1106,97 +1118,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kgkg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Lokasi</translation> </message> @@ -1204,87 +1216,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1697,27 +1709,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1730,37 +1742,37 @@ <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Kamu hendak mengabaikan Rencana</translation> </message> @@ -1782,6 +1794,11 @@ <source>Add dive data point</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1880,7 +1897,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1916,127 +1933,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Tanggal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Peringkat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>edalaman</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Pakaian</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Lokasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2257,6 +2274,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2265,7 +2295,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2311,8 +2341,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2320,7 +2350,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Lokasi</translation> </message> @@ -2361,27 +2391,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Catatan</translation> </message> @@ -2431,6 +2461,16 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2503,108 +2543,108 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Tabung</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Tambah Tabung</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Tambah Sistem Berat</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Simpan</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Batal</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2927,18 +2967,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3122,60 +3161,60 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <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="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3183,54 +3222,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3745,72 +3784,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Selam #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Kedalaman Maks: 1% 2%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Durasi: %1 menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -3941,42 +3980,42 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kgkg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>I</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4257,7 +4296,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4265,17 +4304,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Penjelasan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4500,12 +4539,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Penjelasan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kgkg</translation> </message> @@ -4566,17 +4605,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tipe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation type="unfinished"/> </message> @@ -4597,77 +4636,77 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Total Durasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Terpendek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Terjauh</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Dalam (%1) Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maksimal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4677,29 +4716,29 @@ Rata-rata</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4707,56 +4746,56 @@ Rata-rata</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>udara</translation> </message> @@ -4787,31 +4826,31 @@ Rata-rata</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Gagal baca '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>kosong</translation> </message> @@ -4819,7 +4858,7 @@ Rata-rata</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>pemberhentian deco</translation> </message> @@ -4831,52 +4870,52 @@ Rata-rata</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>nai</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>batas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>beban kerja</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>pemancar</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>gangguan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>tandai</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>permuakaan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation type="unfinished"/> </message> @@ -4884,200 +4923,210 @@ Rata-rata</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>ganti gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>safety stop (bebas)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>safety stop (wajib)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>batas (safety stop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>waktu selam</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>dalam maks</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>waktu mengudara</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>judul</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>peringatan tingkat jaringan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>waktu non stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>nomor kejadian tidak sesuai</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>tidak dapat membuat pengurai untuk %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Gagal mendaftarkan data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Gagal mengurai tanggal</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Gagal mengurai waktu selam</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Gagal mengurai kedalamn maks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Gagal mengurai perhitungan campuran gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> @@ -5089,32 +5138,32 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5124,7 +5173,7 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5205,15 +5254,20 @@ Rata-rata</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5223,231 +5277,231 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> @@ -5567,7 +5621,7 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation type="unfinished"/> </message> @@ -5617,97 +5671,97 @@ EADD: %d%s <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 20bee4359..2befb1259 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -5,19 +5,19 @@ <message> <location filename="../qt-ui/simplewidgets.cpp" line="487"/> <source>Person: </source> - <translation type="unfinished"/> + <translation>Persona:</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -340,22 +340,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/> <source>Read settings from backup file or from device before writing to the device</source> - <translation type="unfinished"/> + <translation>Legge le impostazioni dal dispositivo o dal file di backup prima di scrivere sul dispositivo</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/> <source>Read settings from backup file or from device before writing to a backup file</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> + <translation>Legge le impostazioni dal dispositivo o dal file di backup prima di scrivere sul file di backup</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> - <translation type="unfinished"/> + <translation>OSTC, Mk.2/2N/2C</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="466"/> @@ -406,10 +401,9 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="597"/> <source>Reset device to default settings</source> - <translation type="unfinished"/> + <translation>Reimposta il dispositivo alle impostazioni di fabbrica</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation>Impostazioni avanzate</translation> @@ -418,18 +412,28 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/> <source>Alt GF can be selected underwater</source> + <translation>Alt GF può essere selezionato sott'acqua</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> - <translation type="unfinished"/> + <translation>TTS futuro</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/> <source>Pressure sensor offset</source> - <translation type="unfinished"/> + <translation>Offset del sensore di pressione</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/> @@ -447,46 +451,46 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/> <source>Decotype</source> - <translation type="unfinished"/> + <translation>Decotype</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/> <source> mbar</source> - <translation type="unfinished"/> + <translation> mbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="769"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1892"/> <source> min</source> - <translation type="unfinished"/> + <translation>min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="783"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1925"/> <source>ZH-L16</source> - <translation type="unfinished"/> + <translation>ZH-L16</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="788"/> <source>ZH-L16+GF</source> - <translation type="unfinished"/> + <translation>ZH-L16+GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="851"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1989"/> <source>Alt GFLow</source> - <translation type="unfinished"/> + <translation>Alt GFLow</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="858"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2015"/> <source>Alt GFHigh</source> - <translation type="unfinished"/> + <translation>Alt GFHigh</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="865"/> <source>Flip screen</source> - <translation type="unfinished"/> + <translation>Ruota schermo</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="873"/> @@ -629,12 +633,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/> <source>O2 in calibration gas</source> - <translation type="unfinished"/> + <translation>O2 nel gas di calibrazione</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/> <source>Fixed setpoint</source> - <translation type="unfinished"/> + <translation>Setpoint fisso</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1153"/> @@ -644,7 +648,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/> <source>Setpoint fallback</source> - <translation type="unfinished"/> + <translation>Setpoint fallback</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/> @@ -652,19 +656,32 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2323"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2339"/> <source> cbar</source> - <translation type="unfinished"/> + <translation> cbar</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> + <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> + <source>ppO2 max</source> + <translation>ppO2 max</translation> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> - <translation type="unfinished"/> + <translation>ppO2 min</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -674,7 +691,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1290"/> <source>Altitude range</source> - <translation type="unfinished"/> + <translation>Intervallo di altitudine</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1297"/> @@ -696,19 +713,19 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P0 (nessuno)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> <source>P1 (some)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P1 (medio)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> <source>P2 (much)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P2 (alto)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> @@ -718,27 +735,22 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1455"/> <source>20s</source> - <translation type="unfinished"/> + <translation>20s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1460"/> <source>30s</source> - <translation type="unfinished"/> + <translation>30s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1465"/> <source>60s</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> + <translation>60s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> - <translation type="unfinished"/> + <translation>Modello di computer</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1497"/> @@ -749,17 +761,17 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1511"/> <source>24h</source> - <translation type="unfinished"/> + <translation>24h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1516"/> <source>12h</source> - <translation type="unfinished"/> + <translation>12h</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1524"/> <source>Time format</source> - <translation type="unfinished"/> + <translation>Formato dell'ora</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1539"/> @@ -774,7 +786,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1555"/> <source>s</source> - <translation type="unfinished"/> + <translation>s</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1562"/> @@ -784,12 +796,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1579"/> <source>Depth alarm</source> - <translation type="unfinished"/> + <translation>Allarme di profondità</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1599"/> <source>Time alarm</source> - <translation type="unfinished"/> + <translation>Allarme temporale</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1624"/> @@ -799,47 +811,47 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> <source>kg/l</source> - <translation type="unfinished"/> + <translation>kg/l</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> - <translation type="unfinished"/> + <translation>MM/GG/AA</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/> <source>DD/MM/YY</source> - <translation type="unfinished"/> + <translation>GG/MM/AA</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/> <source>YY/MM/DD</source> - <translation type="unfinished"/> + <translation>AA/MM/GG</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/> <source>ZH-L16 CC</source> - <translation type="unfinished"/> + <translation>ZH-L16 CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> <source>Apnoe</source> - <translation type="unfinished"/> + <translation>Apnea</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> - <translation type="unfinished"/> + <translation>L16-GF OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/> <source>L16-GF CC</source> - <translation type="unfinished"/> + <translation>L16-GF CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> <source>PSCR-GF</source> - <translation type="unfinished"/> + <translation>PSCR-GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="621"/> @@ -920,57 +932,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Dimensione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O₂</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Pressione eser.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Pressione iniz.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Pressione finale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Cambia a</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Cliccando qui si rimuove la bombola.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>La bombola non può essere rimossa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Questo gas è in uso. Solo le bombole che non sono in uso nell'immersione possono essere rimosse.</translation> </message> @@ -1066,22 +1078,22 @@ il computer selezionato?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modello</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>ID della periferica</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Nickname</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Cliccando qui si rimuoverà il computer.</translation> </message> @@ -1109,97 +1121,97 @@ il computer selezionato?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>n</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation>Prof. (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation>Temp (%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Muta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Bombola</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>CNS massimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Luogo</translation> </message> @@ -1207,87 +1219,87 @@ il computer selezionato?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Espandi tutto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Minimizza tutto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Collassa altri</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Rimuove immersione(i) dal viaggio</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Crea un nuovo viaggio sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Aggiungi l'immersione(i) al viaggio subito sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Aggiungi l'immersione(i) al viaggio subito sotto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Raggruppa il viaggio con il viaggio sopra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Raggruppa il viaggio con il viaggio sotto</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Cancella immersione(i)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Marca l'immersione(i) come non valide</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Fondi le immersioni selezionate</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Rinumera le immersioni</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Cambia gli orari</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Carica immagini</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Apri files di immagine</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1359,12 +1371,12 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="159"/> <source>DiveShare</source> - <translation type="unfinished"/> + <translation>DiveShare</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="189"/> <source>Image depths</source> - <translation type="unfinished"/> + <translation>Profondità a cui è stata scattata la foto</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="209"/> @@ -1479,7 +1491,7 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="82"/> <source>Send the dive data to dive-share.appspot.com website</source> - <translation type="unfinished"/> + <translation>Invia i dati di immersione al sito dive-share.appspot.com</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> @@ -1494,7 +1506,7 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="88"/> <source>Write depths of images to file.</source> - <translation type="unfinished"/> + <translation>Esporta la profondità a cui sono state scattate le foto.</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="269"/> @@ -1530,7 +1542,7 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="294"/> <source>Save image depths</source> - <translation type="unfinished"/> + <translation>Salva la profondità a cui sono state scattate le foto</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="300"/> @@ -1700,27 +1712,27 @@ il computer selezionato?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Altitudine</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Tempo di immersione pianificato</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Pressione atmosferica</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1733,37 +1745,37 @@ il computer selezionato?</translation> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Profondità finale</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Run Time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gas utilizzato</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Eliminare il piano?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Stai cancellando il piano</translation> </message> @@ -1785,6 +1797,11 @@ il computer selezionato?</translation> <source>Add dive data point</source> <translation>Aggiungi punto del profilo di immersione</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1836,7 +1853,7 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="129"/> <source>Ambient pressure</source> - <translation type="unfinished"/> + <translation>Pressione ambiente</translation> </message> <message> <location filename="../qt-ui/profile/diveplotdatamodel.cpp" line="117"/> @@ -1869,7 +1886,7 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="14"/> <source>Dialog</source> - <translation type="unfinished"/> + <translation>Dialogo</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="34"/> @@ -1879,12 +1896,12 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="48"/> <source>⌫</source> - <translation type="unfinished"/> + <translation>⌫</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> - <translation>Ottieni UserID</translation> + <source>Get user ID</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1919,127 +1936,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Valutazione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Profondità</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Muta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Bombola</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>CNS massimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Luogo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation>Prof. (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation>Temp (%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2261,6 +2278,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2269,13 +2299,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> <source>Filter this list</source> - <translation type="unfinished"/> + <translation>Filtra questa lista</translation> </message> </context> <context> @@ -2309,14 +2339,14 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Location: </source> - <translation type="unfinished"/> + <translation>Luogo:</translation> </message> </context> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2324,7 +2354,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Luogo</translation> </message> @@ -2365,27 +2395,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Note di immersione</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Temperatura atmosferica</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Temperatura dell'acqua</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Note</translation> </message> @@ -2435,6 +2465,16 @@ p, li { white-space: pre-wrap; } <translation>Consumo gas </translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2507,91 +2547,91 @@ p, li { white-space: pre-wrap; } <translation>Foto</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Bombole</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Aggiungi bombola</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Pesi</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Aggiungi un tipo di pesi</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Salva</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Temp. aria [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Temp. acqua [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Questo viaggio è stato editato.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Si stanno modificando immersioni multiple.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Si sta modificando questa immersione </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Note di viaggio</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Luogo del viaggio</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Immersione più profonda</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Immersione più superficiale</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2600,17 +2640,17 @@ mixati con aria e usando: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>e</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Elimino le modifiche?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Stai per cancellare le modifiche.</translation> </message> @@ -2918,7 +2958,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="638"/> <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="811"/> @@ -2937,19 +2977,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> - <translation type="unfinished"/> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> + <translation>Ctrl+F</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="390"/> @@ -3132,60 +3171,60 @@ p, li { white-space: pre-wrap; } <translation>Stampa la tabella con il runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vuoi salvare le modifiche fatte nel file %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vuoi salvare le modifiche fatte nel file di dati?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Salvo le modifiche?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Apri file come</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Apri file di log immersioni</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Le modifiche saranno perse se tu non le salvi.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Per favore, salva o cancella le modifiche all'immersione prima di aprire un nuovo file.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Per favore, prima completa le modifiche corrente prima di aggiungerne altre.</translation> </message> @@ -3193,54 +3232,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>piedi/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Ultima sosta a 20 piedi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>Dal 50% della prof. media a 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20 piedi alla superficie</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Ultima sosta a 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>Dal 50% della prof. media a 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m alla superficie</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -3755,72 +3794,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Immersione nº%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Massima profondità: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Durata: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Gas usato:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Tags:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Pesi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Note:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Compagno:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Muta:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Visibilità</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Valutazione:</translation> </message> @@ -3850,7 +3889,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation>(Bombola %1)</translation> </message> <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> @@ -3951,42 +3990,42 @@ p, li { white-space: pre-wrap; } <translation>Spostare la mappa e fare doppio-click per definire la posizione dell'immersione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>piedi cubi</translation> </message> @@ -4253,7 +4292,7 @@ p, li { white-space: pre-wrap; } <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> - <translation type="unfinished"/> + <translation>CasellaDiGruppo</translation> </message> </context> <context> @@ -4261,13 +4300,13 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="462"/> <source>Tags: </source> - <translation type="unfinished"/> + <translation>Tag:</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation>Etichette vuote</translation> </message> @@ -4275,17 +4314,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Descrizione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4514,12 +4553,12 @@ OS Architettura CPU: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Descrizione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4580,17 +4619,17 @@ OS Architettura CPU: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Cliccando qui verrà rimossa la zavorra.</translation> </message> @@ -4611,79 +4650,79 @@ OS Architettura CPU: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Anno > Mese / Viaggio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>n</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Durata Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Più corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Più lunga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Profondità (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Massimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4693,29 +4732,29 @@ Media</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>piedi cubi</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4723,56 +4762,56 @@ Media</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>piedi/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>aria</translation> </message> @@ -4803,31 +4842,31 @@ Media</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Impossibile leggere '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> - <translation type="unfinished"/> + <translation>Importazione dal Poseidon fallita: impossibile leggere '%s'</translation> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> - <translation type="unfinished"/> + <translation>Nessun computer corrispondente per il file '%s'</translation> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Il numero massimo di colonne supportate nel file CSV è di %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>nessuno</translation> </message> @@ -4835,64 +4874,64 @@ Media</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deco stop</translation> </message> <message> <location filename="../cochran.c" line="338"/> <source>battery</source> - <translation type="unfinished"/> + <translation>batteria</translation> </message> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>risalita</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>carico di lavoro</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>trasmettitore</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>violazione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>segnalibro</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>sosta di sicurezza</translation> </message> @@ -4900,183 +4939,193 @@ Media</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>cambio gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>sosta di sicurezza (facoltativa)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>sosta di sicurezza (obbligatoria)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>ceiling (sosta di sicurezza)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>durata immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>sotto il piano</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>profondità massima</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>tempo in aria</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>intestazione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>avviso del livello dei tessuti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tempo di non stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>numero evento non valido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Impossibile creare un parser per %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Errore registrando la data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Errore analizzando la data/il tempo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Immersione #%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Errore analizzando il tempo di immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Errore analizzando la profondità massima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Errore analizzando il conteggio della miscela di gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Errore nell'ottenimento della salinità dell'acqua</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Errore nell'ottenere la pressione superficiale</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Errore analizzando la miscela di gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Errore analizzando i campioni</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Evento: in attesa dell' azione dell'utente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modello=%u (0x%08x), firmware=%u (0x%08x), numero di serie=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Errore registrando il gestore degli eventi.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Errore registrando il gestore della cancellazione.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Errore importazione dati immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Impossibile creare un contesto libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Impossibile aprire %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Lettura di strane percentuali %s @@ -5084,19 +5133,19 @@ Media</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Impossibile analizzare '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Interrogazione get_events fallita. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>La query get_tags sul database non è riuscita. @@ -5110,29 +5159,29 @@ Media</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Interrogazione al database fallita '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>La query get_cylinders sul database non è riuscita. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>La query get_changes sul database non è riuscita. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>La query get_profile_sample sul database non è riuscita. @@ -5140,7 +5189,7 @@ Media</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Non é possibile aprire il foglio di stile %s</translation> </message> @@ -5150,7 +5199,7 @@ Media</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Non trovo il gas %s</translation> </message> @@ -5231,15 +5280,20 @@ Media</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Consumo gas:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Avviso</translation> </message> @@ -5249,37 +5303,37 @@ Media</translation> <translation>DISCLAIMER / AVVISO: QUESTA È UNA NUOVA IMPLEMENTAZIONE DELL'ALGORITMO DI BUHLMANN E DELL'IMPLEMENTAZIONE DEL PIANO DI IMMERSIONE BASATO SU CIÒ CHE HA RICEVUTO SOLO UNA LIMITATA QUANTITA' DI TEST. E' ALTAMENTE RACCOMANDATO DI NON PIANIFICARE IMMERSIONI BASATE SEMPLICEMENTE SUI RISULTATI DATI QUI.</translation> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>il gas necessario è superiore a quello disponibile nella bombola</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>riserva di gas non sufficiente per la condivisione in risalita</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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 nella risalita pianificata)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante la risalita pianificata) di %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5288,70 +5342,70 @@ D:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P:%d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN₂ %s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5360,7 +5414,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5369,141 +5423,141 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sosta di sicurezza: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sosta di sicurezza: </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: temo di sosta sconosciuto @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>In deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Ceiling calcolato %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tessuto %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>Battito cardiaco: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>Direzione: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5623,7 +5677,7 @@ EADD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5673,97 +5727,97 @@ EADD: %d%s <translation>(nessuna immersione)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Lun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Mer</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Gio</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Ven</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sab</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Gen</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mag</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Giu</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Lug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Ott</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dic</translation> </message> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index 76cc914f5..032419f99 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tips</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Izmērs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Uzsākšanas spiedums.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Gala spiedums.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Pārslēgties uz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Noklikšķot šeit Jūs noņemsiet balonu.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Balons never būt noņemts.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Šī gāze jau ir pielietota. Var noņemt tikai tos cilindrus, kuri nav pielietoti niršanā.</translation> </message> @@ -1064,22 +1076,22 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modelis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Ierīces ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Lietotājvārds</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Noklikšķot šeit Jūs noņemsiet niršanas datoru.</translation> </message> @@ -1107,97 +1119,97 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>mārciņa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Kostīms</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Balons</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Maks. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Vieta</translation> </message> @@ -1205,87 +1217,87 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Izvērst visu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Savērst visu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Savērst pārējus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Noņemt niršanas reizi(-es) no ceļojuma</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Izveidot jaunu ceļojumu augšup</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Nekavējoties pievienot niršanu(-as) ceļojumam augšup</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Tūlītēji pievienot niršanu(-as) pie apakšēja ceļojuma</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Saplūdināt ceļojumu ar augšējo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Saplūdināt ceļojumu ar apakšējo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Izdzēst niršanu(-as)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Atzīmēt niršanu(-as) kā nepareizus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Saplūdināt izvēlētas niršanas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Pārnumurēt niršanu(-as)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Nobīdīt laikus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Ielādēt attēlus</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Atvērt attēla failu</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ likvidēt izvēlētus datorus?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Augstums</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Plānots dive laiks</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Atmosfēras spiediens</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ likvidēt izvēlētus datorus?</translation> <translation>nezināms</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Gala dziļums</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Izpildes laiks</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Izm. gāze</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC regulēšana</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Atcelt plānu?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Jūs taisāties atcelt plānu.</translation> </message> @@ -1783,6 +1795,11 @@ likvidēt izvēlētus datorus?</translation> <source>Add dive data point</source> <translation>Pievienot niršanas vietu</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ likvidēt izvēlētus datorus?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Datums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Novērtējums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Dziļums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Svars</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Kostīms</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Balons</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Maks. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Vieta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Ilgums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>mārciņa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Vieta</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Niršanas piezīmes</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Gaisa temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Ūdens temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Piezīmes</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation>Gāzes patērēšana</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,108 +2545,108 @@ p, li { white-space: pre-wrap; } <translation>Fotogrāfijas</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Cilindri</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Pievienot cilindri</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Sver</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Pievienot svara sistēmu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Saglabāt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Dzēst</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Gaisa temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Ūdens temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Ceļojuma rediģēšana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Daudzkārtīga ceļojumu rediģēšana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Niršanas rediģēšana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Ceļojuma piezīmes</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Ceļojuma vieta</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Visdziļākā niršana</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>un</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Atcelt izmaiņas?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Jūs taisāties atcelt izmaiņas.</translation> </message> @@ -2933,18 +2973,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3128,60 +3167,60 @@ p, li { white-space: pre-wrap; } <translation>Izdrukāt niršanas tabulu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vai velāties saglabāt izmaiņas datnē %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vai velāties saglabāt izmaiņas datnes datu datnē?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Saglabāt izmaiņas?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Saglabāt kā</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Atvērt niršanas žurnālu</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Izmaiņas pazūs, ja tos nesaglabāt.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Brīdinājums</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lūdzu, saglabājiet vai atceliet pašreizējo niršanu rediģēšanu pirms jauna faila atveršanas.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML datnes (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lūdzu, pabeidziet tekošo rediģēšanu pirms mēģinot citu.</translation> </message> @@ -3189,54 +3228,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Pēdējā pietura pie 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Pēdējā pietura pie 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3751,72 +3790,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>nezināms</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Niršana #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Maks. dziļums: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Ilgums: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Izm. gāze:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Tagi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Krava:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Piezīmes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Niršanas speciālists:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Draugs:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Kostīms:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Redz.:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Novērtējums:</translation> </message> @@ -3947,42 +3986,42 @@ p, li { white-space: pre-wrap; } <translation>Pārvietojiet karti un klikšķiet divreiz, lai atzīmētu niršanas vietu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>mārciņa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>pēda</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>kub. pēda</translation> </message> @@ -4263,7 +4302,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4271,17 +4310,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Apraksts</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4510,12 +4549,12 @@ OS CPU Arhitektūra: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Apraksts</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4576,17 +4615,17 @@ OS CPU Arhitektūra: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tips</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Svars</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Noklikšķot šeit Jūs noņemsiet svara sistēmu.</translation> </message> @@ -4607,79 +4646,79 @@ OS CPU Arhitektūra: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Gads > Mēnesis / Ceļojums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Ilgums Kopā</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Vidējais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Īsakais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Garākais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Dziļums (%1) Vidējais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maksimums</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Vidējais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4689,29 +4728,29 @@ Vidējais</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>paskāls</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4719,56 +4758,56 @@ Vidējais</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) vai (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>gaiss</translation> </message> @@ -4799,31 +4838,31 @@ Vidējais</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Neizdevas nolasīt '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksimālais atbalstītais stabu skaits CSV importēšanai ir %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>neviens</translation> </message> @@ -4831,7 +4870,7 @@ Vidējais</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>deko pietura</translation> </message> @@ -4843,52 +4882,52 @@ Vidējais</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>stāvums</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>maksimāla dekompr. pietura</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>darba slodze</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>raidītājs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>pārkapšana</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>grāmatzīme</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>virsma</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>drošības pietura</translation> </message> @@ -4896,202 +4935,212 @@ Vidējais</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>gāzes maiņa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>drošības pietura (brīvprātīga)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>drošības pietura (obligāta)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>dziļa pietura</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>maksimāla dekompr. pietura (drošības pietura)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>niršanas laiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>zemāk par grīdu</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>maks. dziļums</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>skābekļa laiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>virziens</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>audu līmeņa brīdinājums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>bes apstāšanas laiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>kļūdains notikuma numurs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Nav iespējams izveidot parsētāju priekš %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Kļūda reģistrējot datus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Kļūda parsējot laiku</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Kļūda parsējot niršanas laiku</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Kļūda parsējot maks. dziļumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Kļūda parsējot gāzes maisījuma daudzumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Kļūda ūdens sāļuma noteikšanā</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Kļūda spiediena noteikšanā uz virsmu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Kļūda parsējot gāzes maisījumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Kļūda parsējot paraugus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Notikums: gaida lietotāja darbību</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modelis=%u (0x%08x), aparātprogrammatūra=%u (0x%08x), serial numurs=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Kļūda reģistrējot notikumu apstrādātāju.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Kļūda importējot niršanas datus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Nevar atvērt %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Dīvaina procentu nolasīšana %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Kļūme parsējot '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Kļūme datubāzes vaicājumā get_events. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Neizdevas datubāzes pieprasījums get_tags. @@ -5105,36 +5154,36 @@ Vidējais</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Kļūme vaicājot datubāzi '@s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Neizdevas datubāzes pieprasījums get_cylinders. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Neizdevas datubāzes pieprasījums get_changes. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Neizdevas datubāzes pieprasījums get_profile_sample. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Nevar atvērts stila lapu %s</translation> </message> @@ -5144,7 +5193,7 @@ Vidējais</translation> <translation>EAN</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Nevar atrast gāzi %s</translation> </message> @@ -5225,15 +5274,20 @@ Vidējais</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gāzes patēriņš:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Brīdinājums:</translation> </message> @@ -5243,37 +5297,37 @@ Vidējais</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5282,70 +5336,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>S: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>L: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>Ā: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5354,7 +5408,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5363,49 +5417,49 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Drošības apstāšana: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Drošības apstāšana: nez. laiks @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Dekompr.: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Dekompr.: nez. laiks @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>Dekompresijā </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin @@ -5414,93 +5468,93 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Dekompr.: %umin @ %.0f%s (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>Dekompresijā (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (izrēķ.) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Aprēķināta maks. dekompr. pietura %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Audu līmenis %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>sirdspuksti: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>azimuts: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5620,7 +5674,7 @@ EADD: %d%s <translation>dekompr.</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5670,97 +5724,97 @@ EADD: %d%s <translation>(nav niršanas)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Svēt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Pirm</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Otr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Treš</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Cet</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Piekt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sest</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Maijs</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jūn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Jūl</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 3394131a4..4de629717 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Størrelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Trykkrating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Starttrykk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Sluttrykk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Gassbytte ved</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Klikk her for å fjerne denne flaska.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Flaska kan ikke fjernes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Gassen er i bruk. Bare flasker som ikke er i bruk kan fjernes.</translation> </message> @@ -1063,22 +1075,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Enhets-ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Navn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Klikk her for å fjerne denne dykkecomputeren.</translation> </message> @@ -1106,97 +1118,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Sted</translation> </message> @@ -1204,87 +1216,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Slå sammen andre</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Fjern dykk fra tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Lag ny tur</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Legg til dykk til turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Legg til dykk til turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Slå samme tur med turen over</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Slå sammen tur med turen under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Marker dykk som ugyldige</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Slå sammen valgte dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Renummerer dykk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Flytt tidspunkter</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Last inn bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Åpne bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1697,27 +1709,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Høyde over havet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Planlagt dykketid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>ATM-trykk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1730,37 +1742,37 @@ <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC settpunkt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Slett planen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Du er i ferd med å forkaste planen.</translation> </message> @@ -1782,6 +1794,11 @@ <source>Add dive data point</source> <translation>Legg til punkt</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1880,7 +1897,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1916,127 +1933,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Vurdering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Drakt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Maks CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2258,6 +2275,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2266,8 +2296,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> - <translation>Tekstetikett</translation> + <source>Text label</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2312,8 +2342,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2321,7 +2351,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Sted</translation> </message> @@ -2362,27 +2392,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Notater</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Lufttemp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Vanntemp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -2432,6 +2462,16 @@ p, li { white-space: pre-wrap; } <translation>Gassforbruk</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2504,91 +2544,91 @@ p, li { white-space: pre-wrap; } <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Flasker</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Legg til flaske</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Vekter</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Legg til vektsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Lagre</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Lufttemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Vanntemp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Turnotater</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Tursted</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Dypeste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Grunneste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2597,17 +2637,17 @@ fra luft og bruker: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>og</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -2934,18 +2974,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3129,60 +3168,60 @@ p, li { white-space: pre-wrap; } <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vil du lagre endringene i fila %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vil du lagre endrinene i datafila?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lagre eller avbryt redigeringa før du åpner en ny fil.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Avslutt denne redigeringa før du starter en ny.</translation> </message> @@ -3190,54 +3229,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Siste stopp ved 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdybde til 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft til overflaten</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Siste stopp ved 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdybde til 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m til overflaten</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3752,72 +3791,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Dykk nr. %1- %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Varighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Gassforbruk:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Emneord:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Vekter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notater:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -3948,42 +3987,42 @@ p, li { white-space: pre-wrap; } <translation>Finn sted i kartet og dobbeltklikk for å sette posisjon</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -4264,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4272,17 +4311,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4508,12 +4547,12 @@ OS CPU-arkitektur: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4574,17 +4613,17 @@ OS CPU-arkitektur: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Klikk her for å fjerne dette vektsystemet.</translation> </message> @@ -4605,79 +4644,79 @@ OS CPU-arkitektur: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>År > Måned / Tur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Varighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Lengst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maksimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4687,29 +4726,29 @@ Snitt</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4717,56 +4756,56 @@ Snitt</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>luft</translation> </message> @@ -4797,31 +4836,31 @@ Snitt</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Kunne ikke åpne '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maks antall kolonner i CSV-importen er %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>ingen</translation> </message> @@ -4829,7 +4868,7 @@ Snitt</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dekostopp</translation> </message> @@ -4841,52 +4880,52 @@ Snitt</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>oppstigning</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tak</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>arbeidsbelastning</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>brudd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bokmerke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>overflate</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>sikkerhetsstopp</translation> </message> @@ -4894,202 +4933,212 @@ Snitt</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>gassbytte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>sikkerhetsstopp (frivillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>sikkerhetsstopp (obligatorisk)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>dypstopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>tak (sikkerhetsstopp)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>under tak</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>maksdybde</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>pO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>lufttid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>retning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Advarsel: nivå i vev</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tid uten stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>ugyldig hendelsesnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Kunne ikke lage parser for %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Dykk %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modell=%u (0x%08x), firmware=%u (0x%08x), serienr=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Rar lesing av prosent %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Databasespørring get_events feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Databasespørring get_tags feilet. @@ -5103,36 +5152,36 @@ Snitt</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Databasespørring feilet '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Databasespørring get_cylinders feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Databasespørring get_changes feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Databasespørring get_profile_sample feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -5142,7 +5191,7 @@ Snitt</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> @@ -5223,15 +5272,20 @@ Snitt</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gassforbruk:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> @@ -5241,37 +5295,37 @@ Snitt</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>ikke nok i reserve til å dele gass under oppstigning!</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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 i planlagt oppstigning)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5280,70 +5334,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5352,7 +5406,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5361,142 +5415,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Sikkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Sikkerhetsstopp: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: ukjent tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>I deko </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>I deko (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (kalk.) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Kalkulert tak %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Vev %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>puls: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>retning: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5616,7 +5670,7 @@ EADD: %d%s <translation>deko</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5666,97 +5720,97 @@ EADD: %d%s <translation>(ingen dykk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>søn</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>man</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>tir</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>lør</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>des</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index 04fcd316e..79adfb766 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -5,19 +5,19 @@ <message> <location filename="../qt-ui/simplewidgets.cpp" line="487"/> <source>Person: </source> - <translation type="unfinished"/> + <translation>Persoon:</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -41,11 +41,11 @@ <message> <location filename="../configuredivecomputer.cpp" line="576"/> <source>Device firmware successfully updated</source> - <translation type="unfinished"/> + <translation>Firmware bijgewerkt</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -340,17 +340,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="64"/> <source>Read settings from backup file or from device before writing to the device</source> - <translation type="unfinished"/> + <translation>Instellingen lezen van een backup bestand of van het toestel vóór het bewaren op het toestel</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="90"/> <source>Read settings from backup file or from device before writing to a backup file</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation>Suunto Vyper Familie</translation> + <translation>Instellingen lezen van een backup bestand of van het toestel vóór het bewaren in een backup bestand</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> @@ -409,7 +404,6 @@ <translation>Toestel instellen met standaardinstellingen </translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation>Geavanceerde Instellingen</translation> @@ -418,18 +412,28 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="611"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1819"/> <source>Alt GF can be selected underwater</source> + <translation>Alt GF kan onderwater geselecteerd worden</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> - <translation type="unfinished"/> + <translation>Toekomstige TTS</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/> <source>Pressure sensor offset</source> - <translation type="unfinished"/> + <translation>Druksensor compensatie</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/> @@ -644,7 +648,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1161"/> <source>Setpoint fallback</source> - <translation type="unfinished"/> + <translation>Setpoint terugval</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1184"/> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation>ppO2 max</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation>ppO2 min</translation> @@ -731,11 +748,6 @@ <translation>60s</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation>Totale duiktijd</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation>Computer model</translation> @@ -799,47 +811,47 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> <source>kg/l</source> - <translation type="unfinished"/> + <translation>kg/l</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> - <translation type="unfinished"/> + <translation>MM/DD/JJ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/> <source>DD/MM/YY</source> - <translation type="unfinished"/> + <translation>DD/MM/JJ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/> <source>YY/MM/DD</source> - <translation type="unfinished"/> + <translation>JJ/MM/DD</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/> <source>ZH-L16 CC</source> - <translation type="unfinished"/> + <translation>ZH-L16 CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> <source>Apnoe</source> - <translation type="unfinished"/> + <translation>Apnee</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> - <translation type="unfinished"/> + <translation>L16-GF OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/> <source>L16-GF CC</source> - <translation type="unfinished"/> + <translation>L16-GF CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> <source>PSCR-GF</source> - <translation type="unfinished"/> + <translation>PSCR-GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="621"/> @@ -920,57 +932,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Grootte</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Werkdruk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Startdruk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Einddruk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Wissel op</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Klik hier om de fles te verwijderen.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Fles kan niet verwijderd worden</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden tijdens deze duik kunnen verwijderd worden.</translation> </message> @@ -1066,22 +1078,22 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Toestel ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Apparaatnaam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Klik hier om deze duikcomputer te verwijderen.</translation> </message> @@ -1109,97 +1121,97 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation>Diepte (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation>Temp (%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation>Gewicht (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Pak</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Fles</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation>Gasverbruik (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Locatie</translation> </message> @@ -1207,87 +1219,87 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Alles uitklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Alles inklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>andere samenklappen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>duik(en) uit trip verwijderen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Nieuwe trip hierboven invoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>duik(en) toevoegen aan de trip hierboven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Voeg duik(en) toe aan de trip hieronder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Trip met bovenstaande samenvoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Trip met onderstaande samenvoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>duik(en) verwijderen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>markeer duik(en) als ongeldig</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>geselecteerde duiken samenvoegen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Duik(en) opnieuw nummeren</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>tijdstippen verschuiven</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>afbeeldingen laden</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Afbeelding openen</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,27 +1712,27 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Hoogte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Geplande Duiktijd</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Druk (atm)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1733,37 +1745,37 @@ duikcomputer wilt verwijderen?</translation> <translation>onbekend</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Eind diepte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Verbruikt Gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC Instelpunt</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Plan verwijderen?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>U staat op het punt het plan te verwijderen</translation> </message> @@ -1785,6 +1797,11 @@ duikcomputer wilt verwijderen?</translation> <source>Add dive data point</source> <translation>Duik punt toevoegen</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1883,8 +1900,8 @@ duikcomputer wilt verwijderen?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> - <translation>UserID Ophalen</translation> + <source>Get user ID</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1923,127 +1940,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Waardering</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation>Gewicht (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Pak</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Fles</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation>Gas</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation>Gasverbruik (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Locatie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation>Diepte (%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation>Temp (%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2265,6 +2282,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2273,13 +2303,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> - <translation>Tekstlabel</translation> + <source>Text label</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> <source>Filter this list</source> - <translation type="unfinished"/> + <translation>Deze lijst filteren</translation> </message> </context> <context> @@ -2292,7 +2322,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../configuredivecomputerthreads.cpp" line="1387"/> <source>Firmware update failed!</source> - <translation type="unfinished"/> + <translation>Firmware bijwerken mislukt!</translation> </message> <message> <location filename="../configuredivecomputerthreads.cpp" line="1391"/> @@ -2313,14 +2343,14 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Location: </source> - <translation type="unfinished"/> + <translation>Locatie:</translation> </message> </context> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2328,7 +2358,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Locatie</translation> </message> @@ -2369,27 +2399,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Duiknotities</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Lucht temp.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <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="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notities</translation> </message> @@ -2439,6 +2469,16 @@ p, li { white-space: pre-wrap; } <translation>Gasverbruik</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2511,91 +2551,91 @@ p, li { white-space: pre-wrap; } <translation>Foto's</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Flessen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Fles toevoegen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Gewichten</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Gewichtssysteem toevoegen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Opslaan</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Lucht temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Water temp. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Deze trip wordt bewerkt.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Meerdere duiken worden bewerkt.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Deze duik wordt bewerkt.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Trip notities</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Trip locatie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Diepste duik</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Ondiepste duik</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2604,17 +2644,17 @@ worden uit lucht en: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>en</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Wijzigingen niet opslaan?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>U staat op het punt wijzigingen te verwijderen</translation> </message> @@ -2922,7 +2962,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="638"/> <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="811"/> @@ -2941,19 +2981,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> - <translation>Weefselgrafiek tonen/verbergen</translation> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> + <translation>Ctrl+F</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="390"/> @@ -3136,60 +3175,60 @@ p, li { white-space: pre-wrap; } <translation>Runtime tabel afdrukken</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Wilt u de wijzigingen in bestand %1 bewaren?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Wilt u de wijzigingen bewaren in het bestand?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Aanpassingen opslaan?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Bestand bewaren als</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Open duiklogboek</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Wijzigingen gaan verloren als u deze niet bewaart.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation> </message> @@ -3197,54 +3236,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Laatste stop op 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% gem. diepte tot 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft tot oppervlakte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Laatste stop op 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% gem. diepte tot 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m tot oppervlakte</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -3759,72 +3798,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>onbekend</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Duik #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Max diepte: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Duur: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Verbruikt gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Trefwoorden:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>Gasverbruik:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Gewichten:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Nota's:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Duikpak:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Zichtbaarheid:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Beoordeling:</translation> </message> @@ -3854,7 +3893,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation> (Fles %1)</translation> </message> <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> @@ -3955,42 +3994,42 @@ p, li { white-space: pre-wrap; } <translation>Verplaats de kaart en dubbelklikk om de duiklocatie te selecteren</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4257,7 +4296,7 @@ p, li { white-space: pre-wrap; } <location filename="../qt-ui/tableview.ui" line="14"/> <location filename="../qt-ui/tableview.ui" line="17"/> <source>GroupBox</source> - <translation type="unfinished"/> + <translation>Groepsvak</translation> </message> </context> <context> @@ -4265,13 +4304,13 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="462"/> <source>Tags: </source> - <translation type="unfinished"/> + <translation>Trefwoorden:</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation>Lege trefwoorden</translation> </message> @@ -4279,17 +4318,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Beschrijving</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4518,12 +4557,12 @@ Besturingssysteem CPU %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Beschrijving</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4584,17 +4623,17 @@ Besturingssysteem CPU %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Hier klikken om dit gewichtssysteem te verwijderen.</translation> </message> @@ -4615,79 +4654,79 @@ Besturingssysteem CPU %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Jaar > Maand / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Duur Totaal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Kortste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Langste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Diepte (%1) Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>Gasverbruik (%1) Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4697,29 +4736,29 @@ Maximum</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>Pa</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4727,56 +4766,56 @@ Maximum</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) of (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>lucht</translation> </message> @@ -4807,31 +4846,31 @@ Maximum</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Fout bij lezen van '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Poseidon import mislukt: kan '%s' niet lezen</translation> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation>Geen duikcomputer gevonden voor bestand '%s'</translation> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>geen</translation> </message> @@ -4839,64 +4878,64 @@ Maximum</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>decompressiestop</translation> </message> <message> <location filename="../cochran.c" line="338"/> <source>battery</source> - <translation type="unfinished"/> + <translation>batterij</translation> </message> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>RBT</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>opstijging</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>plafond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>werklast</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>zender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>schending</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bladwijzer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>oppervlakte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>veiligheidsstop</translation> </message> @@ -4904,202 +4943,212 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>gaswissel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>veiligheidsstop (vrijwillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>veiligheidsstop (verplicht)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>diepe stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>plafond (veiligheidsstop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>duiktijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>onder de vloer</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Max. diepte</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>resterende luchttijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>RGBM</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>koers</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>waarschuwing stikstofbelasting</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>nultijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>ongeldig event-nummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Kan geen parser creëren voor %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Fout bij het registreren van de data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Fout bij verwerken van de datum en tijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Duik nr. %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Fout bij verwerken van de duikduur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Fout bij het verwerken van de maximum duikdiepte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Fout bij het verwerken van het aantal gasmengsels</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Fout bij het verkrijgen van het zoutgehalte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Fout bij bekomen van oppervlaktedruk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Fout bij het verwerken van het gasmengsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Fout bij het verwerken van de samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Event: wachten op handeling van gebruiker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serienummer=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Fout bij het registreren van de event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Fout bij het registreren van de cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Fout bij importeren van duikdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Kan geen context creëren voor libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Fout bij openen van %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Vreemde percentage %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Fout bij analyse van '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Database-query get_events mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Database query get_tags mislukt. @@ -5113,36 +5162,36 @@ Maximum</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Database-query mislukt: '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Database query get_cylinders mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Database query get_changes mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Database query get_profile_sample mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Kan de stylesheet %s niet openen</translation> </message> @@ -5152,7 +5201,7 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Gas %s kan niet gevonden worden</translation> </message> @@ -5233,15 +5282,20 @@ Maximum</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gasverbruik:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Waarschuwing:</translation> </message> @@ -5251,37 +5305,37 @@ Maximum</translation> <translation>NIET-AANSPRAKELIJKHEIDSVERKLARING / WAARSCHUWING: DIT IS EEN NIEUWE IMPLEMENTATIE VAN HET BUHLMANN ALGORITME EN EEN IMPLEMENTATIE VAN EEN DUIKPLANNER DIE HIEROP GEBASEERD IS. BEIDE IMPLEMENTATIES HEBBEN MAAR EEN BEPERKTE MATE VAN TESTEN ONDERGAAN. WIJ RADEN MET KLEM AF DUIKEN UIT TE VOEREN DIE GEBASEERD ZIJN OP DE RESULTATEN DIE HIER GETOOND WORDEN.</translation> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dit is meer gas dan beschikbaar in de geselecteerde duikfles!</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>niet genoeg reserve om gas te delen gedurende opstijging!</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s van %s (%.0f%s/%.0f%s in geplande opstijging)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s gedurende geplande opstijging) van %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoge pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>EAN</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5290,70 +5344,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN₂%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5362,7 +5416,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5371,142 +5425,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Veiligheidsstop: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Veiligheidsstop: onbek tijd @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: onbek tijd @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>In deco (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (berekend) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Berekend plafond %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Compartiment %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>hartslag: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>koers: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5626,7 +5680,7 @@ EADD: %d%s <translation>decompressie</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5676,97 +5730,97 @@ EADD: %d%s <translation>(geen duiken)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Zo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Ma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Wo</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Vr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Za</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>mei</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>sept</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>dec</translation> </message> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 7187b242b..dfcfe38c7 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Rodzaj</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Pojemność</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Ciśn. robocze</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Ciśn. początkowe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Ciśn. końcowe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Zmiana na</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Kliknięcie tu usunie butlę z listy.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Butla nie może być usunięta.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ten gaz jest używany. Można usuwać tylko gazy, których nie używasz.</translation> </message> @@ -1064,22 +1076,22 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>ID urządzenia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Nazwa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Kliknięcie tu usunie ten komputer nurkowy.</translation> </message> @@ -1107,97 +1119,97 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Skafander</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Butle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Miejsce</translation> </message> @@ -1205,87 +1217,87 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Rozwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Zwiń wszystkie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Zwiń pozostałe</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Usuń nurkowanie(a) z grupy</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Utwórz nową grupę powyżej</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <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="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <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="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <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="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <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="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Usuń nurkowanie(a)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Oznacz nurkowanie(a) jak niepoprawne</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Połącz wybrane nurkowania</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Zmień czas</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Dodaj zdjęcia</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Dodawanie zdjęć</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ wybrany komputer nurkowy?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Wysokość</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Planowany czas zanurzenia</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Ciśnienie atmosferyczne</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ wybrany komputer nurkowy?</translation> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Głębokość końcowa</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Używany gaz</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Porzucić plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Masz zamiar porzucić plan</translation> </message> @@ -1783,6 +1795,11 @@ wybrany komputer nurkowy?</translation> <source>Add dive data point</source> <translation>dodaj punkt do profilu</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ wybrany komputer nurkowy?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Ocena</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Skafander</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Butle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Miejsce</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Miejsce</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Notatki</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <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="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <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="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Opis</translation> </message> @@ -2434,6 +2464,16 @@ p, li { white-space: pre-wrap; } </translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2506,91 +2546,91 @@ p, li { white-space: pre-wrap; } <translation>Zdjęcia</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Butle</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Dodaj butlę</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Dodaj balast</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Zapisz</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Temp. powietrza [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Temp. wody [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Ta grupa nurkowań jest obecnie edytowana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Kilka nurkowań jest obecnie edytowanych.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>To nurkowanie jest obecnie edytowane.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Opis nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Miejsce nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Najgłębsze nurkowanie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Najpłytsze nurkowanie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2599,17 +2639,17 @@ z powietrza przy użyciu: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>oraz </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Porzucić zmiany?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Masz zamiar porzucić zmiany.</translation> </message> @@ -2936,18 +2976,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3131,60 +3170,60 @@ p, li { white-space: pre-wrap; } <translation>Drukowanie planu nurkowego</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Zapisać zmiany?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Otwórz plik z logiem</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <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="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <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> @@ -3192,54 +3231,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Ostatni przystanek na gł. 20 stóp</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <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="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft do powierzchni</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Ostatni przystanek na 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <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="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m do powierzchni</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3754,72 +3793,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Nurkownie #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Max głębokość: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Czas: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Użyty gaz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Tagi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Balast:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Opis:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Skafander:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Widzialność:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Ocena:</translation> </message> @@ -3950,42 +3989,42 @@ p, li { white-space: pre-wrap; } <translation>Przesuń mapę i wskaż lokalizację dwuklikiem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4266,7 +4305,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4274,17 +4313,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Opis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4513,12 +4552,12 @@ Architektura OS CPU: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Opis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4579,17 +4618,17 @@ Architektura OS CPU: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Rodzaj</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Kliknięcie tu usunie balast z listy.</translation> </message> @@ -4610,74 +4649,74 @@ Architektura OS CPU: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Rok > Miesiąc / grupa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Czas trwania całkowity</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation>średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation>najkrótszy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation>najdłuższy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Głębokość (%1) średnia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation>minimalna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation>maksymalna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -4687,29 +4726,29 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4717,56 +4756,56 @@ Maximum</source> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) lub (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>powietrze</translation> </message> @@ -4797,31 +4836,31 @@ Maximum</source> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Błąd odczytu '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>brak</translation> </message> @@ -4829,7 +4868,7 @@ Maximum</source> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>przystanek deco</translation> </message> @@ -4841,52 +4880,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>pozostały czas denny</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>wynurzanie</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>sufit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>wysiłek</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>nadajnik</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>naruszenie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>notatka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>powierzchnia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>przystanek bezpieczeństwa</translation> </message> @@ -4894,202 +4933,212 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>zmiana gazu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>przystanek bezpieczeństwa (opcjonalny)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>przystanek bezpieczeństwa (obowiązkowy)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>sufit (przystanek bezpieczeństwa)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>czas nurkowania</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>poniżej podłogi deco</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Max głębokość</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>Pozostały czas oddychania</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>kierunek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Ostrzeżenie: poziom nasycenia tkanek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>czas bezdekompresyjny</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>niepoprawny znacznik</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Nie udało się utworzyć parsera dla %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Błąd podczas przetwarzania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Błąd podczas przetwarzania daty i czasu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Nurkowanie %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Błąd podczas przetwarzania czasu nurkowania</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Błąd podczas przetwarzania głębokości</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Błąd podczas przetwarzania danych o ilości użytych rodzajów gazu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Błąd podczas przetwarzania danych o zasoleniu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Błąd podczas przetwarzania danych o użytym rodzaju gazu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Błąd podczas przetwarzania próbek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Oczekiwanie na działanie użytkownika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), numer seryjny=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Błąd rejestracji uchwytu (event handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Błąd rejestracji uchwytu (cancellation handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Błąd podczas importowania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Nie można utworzyć kontekstu libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Nie udało się otworzyć %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Podejrzany skład procentowy %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Nie udało się przetworzyć '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Zapytanie bazy danych get_events nie powiodło się.⏎ </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Zapytanie bazy danych get_tags nie powiodło się. @@ -5103,36 +5152,36 @@ Maximum</source> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Błąd komunikacji z bazą danych '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Zapytanie bazy danych get_cylinders nie powiodło się. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Zapytanie bazy danych get_changes nie powiodło się. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Zapytanie bazy danych get_profile_sample nie powiodło się. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Nie można otworzyć arkusza stylów %s</translation> </message> @@ -5142,7 +5191,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Nie można znaleźć gazu %s</translation> </message> @@ -5223,15 +5272,20 @@ Maximum</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Zużycie gazu:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Ostrzeżenie:</translation> </message> @@ -5241,37 +5295,37 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <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="677"/> + <location filename="../planner.c" line="680"/> <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="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <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="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5280,70 +5334,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5352,7 +5406,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5361,35 +5415,35 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Przystanek bezp.: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Przystanek bezp.: nieznany czas @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: nieznany czas @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>dekompresja @@ -5397,107 +5451,107 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (obliczone) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>dekompresja (obliczone) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Obliczony sufit: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tkanka %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>tętno: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sGł:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sGł:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5617,7 +5671,7 @@ EADD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5667,97 +5721,97 @@ EADD: %d%s <translation>(brak nurkowań)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Nie</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Wto</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Śro</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Czw</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Pią</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sob</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Sty</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Lut</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Kwi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Cze</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Lip</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Sie</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Wrz</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Paź</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Lis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Gru</translation> </message> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index 2a4983761..db69cbded 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Tamanho</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Pressão de trabalho</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Pressão inicial</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Pressão final</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Trocar aos</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Ao clicar aqui irá eliminar este cilindro.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Cilindro não pode ser eliminado</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Esse gás está em uso, Apenas cilindros que não estão sendo usados podem ser removidos.</translation> </message> @@ -1064,22 +1076,22 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Apelido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Clicar aqui removerá os computadores de mergulho</translation> </message> @@ -1107,97 +1119,97 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Roupa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Cilindro</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>CNS Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Local</translation> </message> @@ -1205,87 +1217,87 @@ o computador de mergulho selecionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Esconder todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Esconder outros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulhos de viagem</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Criar viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulhos para a viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulhos para viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Juntar viagem com viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Juntar viagem com viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Apagar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Marcar megulho(s) como inválidos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Juntar mergulhos selecionados</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Deslocar tempo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Carregar imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Abrir imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ o computador de mergulho selecionado?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Tempo do mergulho planejado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>pressão atmosférica</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ o computador de mergulho selecionado?</translation> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Tempo</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>ponto CC</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Descartar o plano?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Você está prestes a eliminar seu planejamento.</translation> </message> @@ -1783,6 +1795,11 @@ o computador de mergulho selecionado?</translation> <source>Add dive data point</source> <translation>Adicionar ponto</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ o computador de mergulho selecionado?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Roupa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Cilindro</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>CNS Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Local</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <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="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Temperatura do ar</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Temperatura da água</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation>Consumo de gás</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,91 +2545,91 @@ p, li { white-space: pre-wrap; } <translation>Fotos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Cilindros</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Adicionar cilindro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Salvar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Temperatura do Ar [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Temperatura da água [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Esta viagem está sendo editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Vários mergulhos estão sendo editados.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Este mergulho está sendo editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Notas da viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Local do mergulho</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Mergulho mais profundo</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Mergulho mais raso</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2598,17 +2638,17 @@ misturados com ar usando: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>e</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Descartar alterações?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Você está prestes a eliminar suas alterações.</translation> </message> @@ -2935,18 +2975,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3130,60 +3169,60 @@ p, li { white-space: pre-wrap; } <translation>Imprimir tabela</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Você quer salvar as alterações que fez no arquivo %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Você quer salvar as alterações feitas no arquivo?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Salvar Alteraḉões?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Salvar arquivo como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <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="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor, salve ou cancele a edição atual do mergulho antes de abrir um novo arquivo.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Primeiro termine a edição atual antes de editar outro.</translation> </message> @@ -3191,54 +3230,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>pés/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Ultima parada em 20 pés</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Ultima parada em 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3753,72 +3792,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Mergulho #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Profundidade máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Tags:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Companheiro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Roupa:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -3949,42 +3988,42 @@ p, li { white-space: pre-wrap; } <translation>Mova o mapa e dê um duplo clique para definir a localização do ponto de mergulho.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>pés cúbicos</translation> </message> @@ -4265,7 +4304,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4273,17 +4312,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4511,12 +4550,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4577,17 +4616,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation type="unfinished"/> </message> @@ -4608,79 +4647,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Ano > Mês / Viagem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>nº</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4690,29 +4729,29 @@ Médio</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>pés cúbicos</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4720,56 +4759,56 @@ Médio</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>pé(s)</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>pés/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>pés/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>ar</translation> </message> @@ -4800,31 +4839,31 @@ Médio</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Falha na leitura de '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>O número máximo de colunas suportadas ao importar arquivos CSV é %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>nenhum</translation> </message> @@ -4832,7 +4871,7 @@ Médio</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>parada de deco</translation> </message> @@ -4844,52 +4883,52 @@ Médio</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>subida</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>teto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>nível de esforço</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmissor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>violação</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>favorito</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>superfície</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>parada de segurança</translation> </message> @@ -4897,183 +4936,193 @@ Médio</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>troca de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>parada de segurança (voluntária)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>parada de segurança (obrigatória)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>parada profunda</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>teto (parada de segurança)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>duração do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>abaixo da zona de descompressão</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>prof máx</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>tempo de ar</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>direção</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Alarme do nível nos tecidos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tempo sem parada</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>número de evento inválido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Não é possivel criar o analisador para %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Erro no registo dos dados</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/horário</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Mergulho nº %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Erro na análise da duração do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Erro na análise da contagem de misturas de gases</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Erro na obtenção da pressão na superfície</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Erro na análise da mistura de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Evento: aguardando ação do usuário</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Erro no registo do rótulo do evento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do rótulo de cancelamento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Erro ao importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto da libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Percentagem estranha na leitura %s @@ -5081,19 +5130,19 @@ Médio</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>A consulta "get_events" falhou. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Pesquisa no banco de dados falhou no get_tags @@ -5107,36 +5156,36 @@ Médio</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Consulta da base de dados falhou '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Pesquisa no banco de dados falhou no get_cylinders </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Pesquisa no banco de dados falhou no get_changes </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Pesquisa no banco de dados falhou no get_profile_sample </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Falha na abertura da folha de estilo %s</translation> </message> @@ -5146,7 +5195,7 @@ Médio</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Não é possivel achar gas o %s</translation> </message> @@ -5227,15 +5276,20 @@ Médio</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Consumo de gás</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Aviso:</translation> </message> @@ -5245,37 +5299,37 @@ Médio</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Isso é mais gás que a capacidade do cilindro especificado</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Sem reserva para compartilhar ar na subida</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s durante a subida planejada) de %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valor pO₂ alto %.2f em %d:%02u com gás %s na profundidade %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5284,70 +5338,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5356,7 +5410,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5365,140 +5419,140 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Parada de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Parada de segurança: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>Em deco </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>Em deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Teto calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tecido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>Cardio: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5618,7 +5672,7 @@ EADD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5668,97 +5722,97 @@ EADD: %d%s <translation>(nenhum mergulho)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Seg</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Ter</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Qua</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Qui</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Sex</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sáb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 51b02d912..406c7aeb4 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -5,19 +5,19 @@ <message> <location filename="../qt-ui/simplewidgets.cpp" line="487"/> <source>Person: </source> - <translation type="unfinished"/> + <translation>Pessoa:</translation> </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,8 +45,8 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> - <translation>As configurações do dispositivo foram reinicializadas com sucesso</translation> + <source>Device settings successfully reset</source> + <translation type="unfinished"/> </message> </context> <context> @@ -348,11 +348,6 @@ <translation>Ler configurações do ficheiro de backup ou do dispositivo antes de criar uma cópia de segurança</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation>Família Suunto Vyper</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation>OSTC, Mk.2/2N/2C</translation> @@ -409,7 +404,6 @@ <translation>Reinicializar dispositivo para as configurações padrão</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation>Configurações avançadas</translation> @@ -421,6 +415,16 @@ <translation>Alt GF pode ser seleccionado debaixo de água</translation> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation>ppO2 max</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation>ppO2 min</translation> @@ -731,11 +748,6 @@ <translation>60s</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation>Tempo total de mergulho</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation>Modelo do computador de mergulho</translation> @@ -799,47 +811,47 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> <source>kg/l</source> - <translation type="unfinished"/> + <translation>kg/l</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> - <translation type="unfinished"/> + <translation>MM/DD/AA</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1746"/> <source>DD/MM/YY</source> - <translation type="unfinished"/> + <translation>DD/MM/AA</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1751"/> <source>YY/MM/DD</source> - <translation type="unfinished"/> + <translation>AA/MM/DD</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1935"/> <source>ZH-L16 CC</source> - <translation type="unfinished"/> + <translation>ZH-L16 CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> <source>Apnoe</source> - <translation type="unfinished"/> + <translation>Apneia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> - <translation type="unfinished"/> + <translation>L16-GF OC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1950"/> <source>L16-GF CC</source> - <translation type="unfinished"/> + <translation>L16-GF CC</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1955"/> <source>PSCR-GF</source> - <translation type="unfinished"/> + <translation>PSCR-GF</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="621"/> @@ -920,57 +932,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Capacidade</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Pressão de serviço</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Pressão inicial</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Pressão final</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Mudar aos</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Ao clicar aqui irá eliminar esta garrafa.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>A garrafa não pode ser eliminada</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Este gás está a ser usado. Apenas podem ser removidas as garrafas que não foram usadas durante o mergulho.</translation> </message> @@ -1066,22 +1078,22 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Alcunha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Ao clicar aqui irá remover este computador de mergulho.</translation> </message> @@ -1109,97 +1121,97 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>pé</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation>Temperatura(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Fato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Garrafa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>CNS Máx</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Local</translation> </message> @@ -1207,87 +1219,87 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Colapsar todos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Colapsar outros</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulho(s) desta viagem</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Criar uma nova viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <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="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulho(s) à viagem imediatamente abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Juntar esta viagem com a viagem acima</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Juntar esta viagem com a viagem abaixo</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Eliminar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Marcar mergulho(s) como inválido(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Juntar os mergulhos seleccionados</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Alterar tempos</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Carregar imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Abrir ficheiros de imagens</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,27 +1712,27 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Altitude</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Data e hora </translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Pressão atmosférica</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1733,37 +1745,37 @@ remover o computador de mergulho seleccionado?</translation> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Tempo de mergulho</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Eliminar o plano?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Está prestes a eliminar o plano.</translation> </message> @@ -1785,6 +1797,11 @@ remover o computador de mergulho seleccionado?</translation> <source>Add dive data point</source> <translation>Adicionar ponto ao mergulho</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1883,8 +1900,8 @@ remover o computador de mergulho seleccionado?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> - <translation>Obter UserID</translation> + <source>Get user ID</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1923,127 +1940,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Classificação</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>pés</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation>Peso(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Fato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Garrafa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation>Gás</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>CNS Máx</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Local</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation>Profundidade(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation>Temperatura(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>libras</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2265,6 +2282,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2273,13 +2303,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> <source>Filter this list</source> - <translation type="unfinished"/> + <translation>Filtrar esta lista</translation> </message> </context> <context> @@ -2313,14 +2343,14 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="513"/> <source>Location: </source> - <translation type="unfinished"/> + <translation>Local:</translation> </message> </context> <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2328,7 +2358,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Local</translation> </message> @@ -2369,27 +2399,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <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="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <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="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <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="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -2439,6 +2469,16 @@ p, li { white-space: pre-wrap; } <translation>Consumo de gás</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2511,91 +2551,91 @@ p, li { white-space: pre-wrap; } <translation>Fotos</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Garrafas</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Adicionar garrafa</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Gravar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Temp. do ar [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Temp. da água [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Esta viagem está a ser editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <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="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Este mergulho está a ser editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Notas sobre a viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Local da viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Mergulho mais fundo</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Mergulho menos fundo</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2604,17 +2644,17 @@ obtidos a partir do ar usando: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>e</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Eliminar as alterações?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Está prestes a eliminar as alterações.</translation> </message> @@ -2922,7 +2962,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="638"/> <source>Ctrl+Shift+C</source> - <translation type="unfinished"/> + <translation>Ctrl+Shift+C</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="811"/> @@ -2941,19 +2981,18 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> - <translation>Mostrar/ocultar gráfico dos tecidos</translation> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> + <translation>Ctrl+F</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="390"/> @@ -3136,60 +3175,60 @@ p, li { white-space: pre-wrap; } <translation>Imprimir tabela de runtime</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Guardar ficheiro como</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Abrir ficheiro de registo de mergulhos</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <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="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <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> @@ -3197,54 +3236,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Última paragem aos 20 ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <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="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>6 m/20 ft para a superfície</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Última paragem aos 6 m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <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="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6 m para a superfície</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -3759,72 +3798,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Mergulho #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Prof. Máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Gás usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Etiquetas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>Consumo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Guia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Companheiros:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Fato:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -3854,7 +3893,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1105"/> <source> (Tank %1)</source> - <translation type="unfinished"/> + <translation>(Garrafa %1)</translation> </message> <message> <location filename="../qt-ui/profile/profilewidget2.cpp" line="1110"/> @@ -3955,42 +3994,42 @@ p, li { white-space: pre-wrap; } <translation>Mova o mapa e dê um duplo clique para definir o local de mergulho</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>pé</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>pé cúbico</translation> </message> @@ -4265,13 +4304,13 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/simplewidgets.cpp" line="462"/> <source>Tags: </source> - <translation type="unfinished"/> + <translation>Etiquetas:</translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation>Etiquetas vazias</translation> </message> @@ -4279,17 +4318,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4518,12 +4557,12 @@ Arquitectura do CPU e SO: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4584,17 +4623,17 @@ Arquitectura do CPU e SO: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Ao clicar aqui irá remover este sistema de lastro</translation> </message> @@ -4615,79 +4654,79 @@ Arquitectura do CPU e SO: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Ano >Mês / Viagem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>Consumo (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -4697,29 +4736,29 @@ Média</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>pés cúbicos</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4727,56 +4766,56 @@ Média</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>pés</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>libras</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>ar</translation> </message> @@ -4807,31 +4846,31 @@ Média</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Falha na leitura de '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Falha ao importar Poseidon: não foi possíve ler '%s'</translation> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation>Não foi possível encontrar um computador de mergulho correspondente ao ficheiro '%s'</translation> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>nenhum</translation> </message> @@ -4839,64 +4878,64 @@ Média</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>paragem de deco</translation> </message> <message> <location filename="../cochran.c" line="338"/> <source>battery</source> - <translation type="unfinished"/> + <translation>bateria</translation> </message> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>subida</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tecto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>esforço</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmissor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>transgressão</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>marcador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>superfície</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>paragem de segurança</translation> </message> @@ -4904,183 +4943,193 @@ Média</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>troca de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>paragem de segurança (voluntária)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>paragem de segurança (obrigatória)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>paragem funda</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>tecto (paragem de segurança)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>Tempo de mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>abaixo da zona de descompressão</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Profundidade máxima</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>autonomia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>cabeçalho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>Alarme de tensão de azoto nos tecidos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>tempo sem paragem</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>Número de evento inválido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Não é possivel criar o "parser" para %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Erro no registo de dados</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/tempo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Mergulho nº %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Erro na análise do tempo de mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Erro na análise na contagem da mistura de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Erro na obtenção da pressão atmosférica</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Erro na análise da mistura de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Evento: à espera de acção do utilizador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>modelo=%u (0x%08x), firmware=%u (0x%08x), Nº de série=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Erro no registo do "event handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do "cancellation handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Erro a importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto do libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Leitura estranha das percentagens %s @@ -5088,19 +5137,19 @@ Média</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>A consulta "obter eventos" falhou. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Falha no query get_tags à base de dados. @@ -5114,36 +5163,36 @@ Média</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>A consulta da base de dados falhou '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Falha na obtenção do query get_cylinders da base de dados. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Falha na obtenção do query get_changes na base de dados. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Falha na obtenção do query get_profile_sample da base de dados. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Não é possível abrir a folha de estilos %s</translation> </message> @@ -5153,7 +5202,7 @@ Média</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Não foi possível encontrar o gás %s</translation> </message> @@ -5234,15 +5283,20 @@ Média</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Consumo de gás:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Aviso:</translation> </message> @@ -5253,37 +5307,37 @@ Média</translation> Recomenda-se aos utilizadores que não se baseiem apenas nesta ferramenta para planear os seus mergulhos.</translation> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <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="677"/> + <location filename="../planner.c" line="680"/> <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="679"/> + <location filename="../planner.c" line="682"/> <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 na subida planeada)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <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="696"/> + <location filename="../planner.c" line="699"/> <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 à profundidade de %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5292,70 +5346,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5365,7 +5419,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5375,49 +5429,49 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Paragem de segurança: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Paragem de segurança: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Descompressão: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Descompressão: tempo desconhecido @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>Em descompressão </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin @@ -5425,93 +5479,93 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Descompressão: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>Em descompressão (calc) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Tecto calculado %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tecido %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>frequência cardíaca: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>enfiamento: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5631,7 +5685,7 @@ EADD: %d%s <translation>descompressão</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5681,97 +5735,97 @@ EADD: %d%s <translation>(nenhum mergulho)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Seg</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Ter</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Qua</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Qui</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Sex</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sáb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dez</translation> </message> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index c9c6ab51d..c025fa84a 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Mărime</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Schimbă la</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Făcând click aici veți înlătura acest tub.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Tubul nu poate fi înlăturat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1064,22 +1076,22 @@ computerul de scufundări selectat?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>ID-ul dispozitivului</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Alias</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"/> </message> @@ -1107,97 +1119,97 @@ computerul de scufundări selectat?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Costum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Locație</translation> </message> @@ -1205,87 +1217,87 @@ computerul de scufundări selectat?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -1698,27 +1710,27 @@ computerul de scufundări selectat?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ computerul de scufundări selectat?</translation> <translation>necunoscut</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Sunteți pe cale de a șterge planul.</translation> </message> @@ -1783,6 +1795,11 @@ computerul de scufundări selectat?</translation> <source>Add dive data point</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ computerul de scufundări selectat?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Dată</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Rating</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Greutate</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Costum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Locație</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Locație</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notițe</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,108 +2545,108 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Tub</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Adaugă Tub</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Greutăți</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Adaugă Sistem de Greutăți</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Înregistrare</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Anulează</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Această scufundare este editată</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2929,18 +2969,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3124,60 +3163,60 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Modificările vor fi pierdute dacă nu le salvați.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Avertizare</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a deschide un nou fișier.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3185,54 +3224,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3747,72 +3786,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>necunoscut</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Scufundarea #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Adâncimea maximă: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Durata: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>GreutățiȘ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notițe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Maestru scufundare:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Companion:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Costum:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Rating:</translation> </message> @@ -3943,42 +3982,42 @@ p, li { white-space: pre-wrap; } <translation>Mutați harta si faceți dublu click pentru a seta locația scufundării</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>livre pe inch pătrat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>picioare cubice</translation> </message> @@ -4259,7 +4298,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4267,17 +4306,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Descriere</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4502,12 +4541,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Descriere</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4568,17 +4607,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Greutate</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation type="unfinished"/> </message> @@ -4599,79 +4638,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>An > Luna / Excursie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Durată Totală</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Medie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Cel mai scurt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Cel mai lung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Adâncime (%1) Medie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maxim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Mediu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4681,29 +4720,29 @@ Medie</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>Pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>livre pe inch pătrat</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>picioare cubice</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4711,56 +4750,56 @@ Medie</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>picioare</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>livre</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) sau (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>aer</translation> </message> @@ -4791,31 +4830,31 @@ Medie</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Nu s-a putut citi '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Numărul maxim de coloane suportate la importarea CSV-ului este %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>niciunul</translation> </message> @@ -4823,7 +4862,7 @@ Medie</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>oprire de decompresie</translation> </message> @@ -4835,52 +4874,52 @@ Medie</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>ascensiune</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>plafon</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>volum de muncă</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>transmițător</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>încălcare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>semn de carte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>suprafață</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>oprire pentru siguranță</translation> </message> @@ -4888,202 +4927,212 @@ Medie</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>schimbarea gazului</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>oprire pentru siguranță (voluntară)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>oprire pentru siguranță (obligatorie)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>plafon (oprire pentru siguranță)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>timp scufundare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>adâncime maximă</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>timp aer rămas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>direcție</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>avertizare nivel țesut</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>timp fără oprire</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>numărul evenimentul este invalid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Nu s-a putut crea parser pentru %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Eroare înregistrând datele</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Eroare parsând data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Scufundarea %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Eroare parsând data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Eroare parsând adâncimea maximă</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Eroare parsând valoarea amestecului de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Eroare obținând salinitatea apei</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Eroare obținând presiunea la suprafață</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Eroare parsând amestecul de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Eroare parsând eșantioanele</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Eveniment: aștept acțiunea utilizatorului</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Eroare la înregistrarea handlerului de evenimente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Eroare la înregistrarea handlerului de anulare.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Eroare la importarea datelor despre scufundare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Nu s-a putut crea contextul libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Nu s-a putut deschide %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Valoare procentuală neobișnuită %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Nu s-a putut parsa „%s”</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Query-ul get_events nu a reușit. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> @@ -5096,33 +5145,33 @@ Medie</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Query-ul bazei de date a eșuat „%s”. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Nu s-a putut deschide stylesheet-ul %s</translation> </message> @@ -5132,7 +5181,7 @@ Medie</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5213,15 +5262,20 @@ Medie</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5231,232 +5285,232 @@ Medie</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5576,7 +5630,7 @@ EADD: %d%s <translation>decompresie</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation type="unfinished"/> </message> @@ -5626,97 +5680,97 @@ EADD: %d%s <translation>(nicio scufundare)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Duminică</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Luni</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Marți</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Miercuri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Joi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Vineri</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Sâmbătă</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Iun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Iul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Noi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 5fef75f28..321113d62 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Объем</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Раб. давл.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Нач. давл.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Кон. давл.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Переключить на</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Нажмите здесь чтобы удалить этот баллон.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Баллон не может быть удален</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation> </message> @@ -1064,22 +1076,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Модель</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Идентификатор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Название</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Нажмите здесь чтобы удалить этот дайвкомпьютер.</translation> </message> @@ -1107,97 +1119,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -1205,87 +1217,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Удалить из поездки</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Добавить к поездке сверху</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Добавить к поездке снизу</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Удалить</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Пометить как ошибочное(-ые)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Загрузить фото</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Открыть файлы изображений</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Высота</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Планируемое время погружения</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Атм. давление</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>мбар</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>м</translation> </message> @@ -1731,37 +1743,37 @@ <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Время отсчета</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>Установка CC</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Отменить план?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Вы собираетесь отказаться от плана.</translation> </message> @@ -1783,6 +1795,11 @@ <source>Add dive data point</source> <translation>Добавить путевую точку</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Погружение</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation>Расход газа</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,91 +2545,91 @@ p, li { white-space: pre-wrap; } <translation>Фотографии</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Баллоны</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Грузы</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Добавить груз</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Темп. воздуха [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Темп. воды [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Максимум</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2598,17 +2638,17 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation> и </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -2935,18 +2975,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3130,60 +3169,60 @@ p, li { white-space: pre-wrap; } <translation>Печать плана погружения</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> @@ -3191,54 +3230,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Последняя остановка на 20фт</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% ср. глубины - 20фут</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20фут - поверхность</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Последняя остановка на 6м</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% ср. глубины - 6м</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6м - поверхность</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3753,72 +3792,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Погружение №%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Макс. глубина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Длительность: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Исп. газы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Метки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Грузы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Заметки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Видимость:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> @@ -3949,42 +3988,42 @@ p, li { white-space: pre-wrap; } <translation>Выберите место на карте двойным щелчком мыши.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>куб. фут</translation> </message> @@ -4265,7 +4304,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4273,17 +4312,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>мл</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>бар</translation> </message> @@ -4512,12 +4551,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>кг</translation> </message> @@ -4578,17 +4617,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Нажмите здесь чтобы удалить эту грузовую систему.</translation> </message> @@ -4609,79 +4648,79 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Год > Месяц / Поездка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Длительность Общее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Кратчайшее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Самое долгое</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Глубина (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Минимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -4691,29 +4730,29 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>Па</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4721,56 +4760,56 @@ Maximum</source> <translation>м</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>м/с</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>фут/с</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>воздух</translation> </message> @@ -4801,31 +4840,31 @@ Maximum</source> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Ошибка чтения '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>отсутствует</translation> </message> @@ -4833,7 +4872,7 @@ Maximum</source> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>деко стоп</translation> </message> @@ -4845,52 +4884,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>оставшееся время на дне</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>подъем</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>потолок</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>нагрузка</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>передатчик</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>нарушение</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>закладка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>поверхность</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>остановка безопасности</translation> </message> @@ -4898,202 +4937,212 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>замена смеси</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>остановка безопасности (добровольно)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>остановка безопасности (обязательно)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>глубокая остановка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>потолок (остановка безопасности)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>время погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>ниже пола</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>макс. глуб.</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>оставшееся время по воздуху</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>направление</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>насыщение тканей</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>время без остановки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>неверный номер события</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Ошибка разбора даты/времени</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Погр. №%d - %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Ошибка разбора времени погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Ошибка разбора макс. глубины</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Ошибка разбора счетчика смесей</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Ошибка получения солености воды</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Ошибка получения давления на поверхности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Странное значение процентов %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Ошибка запроса get_events в БД. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Запрос get_tags в базу не выполнился. @@ -5107,36 +5156,36 @@ Maximum</source> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Ошибка запроса к БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Запрос get_cylinders в базу не выполнился. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Запрос get_changes в базу не выполнился. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Запрос get_profile_sample в базу не выполнился. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> @@ -5146,7 +5195,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> @@ -5227,15 +5276,20 @@ Maximum</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Расход газов:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Внимание:</translation> </message> @@ -5245,37 +5299,37 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <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="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5284,70 +5338,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>Д: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5356,7 +5410,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5365,142 +5419,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Ост. безопасности: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Ост. безопасности: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Ткань %.0fмин: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> @@ -5620,7 +5674,7 @@ EADD: %d%s <translation>деко стоп</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>л</translation> </message> @@ -5670,97 +5724,97 @@ EADD: %d%s <translation>(нет погружений)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Вск</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Пнд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Втр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Срд</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Чтв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Птн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Суб</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Дек</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index ce38a3348..72c48f6b9 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -920,57 +932,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Veľkosť</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Pracovný tlak.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Počiatočný tlak.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Tlak na konci.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Zmeň v</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Kliknutím sem vymažeš fľašu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Flaša nemôže byť vymazaná</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Táto zmes sa používa. Len fľaše, ktoré nie sú použité pri ponore, môžu byť vymazané.</translation> </message> @@ -1066,22 +1078,22 @@ vybraný počítač?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>ID zariadenia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Voliteľný názov</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Kliknutím sem vymažeš počítač.</translation> </message> @@ -1109,97 +1121,97 @@ vybraný počítač?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation>Hĺbka(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation>Tepl(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation>Záťaž(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Fľaša</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation>Zmes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Miesto</translation> </message> @@ -1207,87 +1219,87 @@ vybraný počítač?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Expandovať všetky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Zredukovať všetky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Zbaliť ostatné</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Vymazať ponor(y) z akcie</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Vytvoriť novú akciu nad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>Pridať ponor(y) do akcie hneď nad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>Pridať ponor(y) do akcie hneď pod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Spoj akciu s akciou nad</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Spoj akciu s akciou pod</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Zmazať ponor(y)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Neplatný ponor(y)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Spojiť vybraté ponory</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Prečíslovanie ponorov</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Posun času</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Nahrať obrázky</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Otvoriť súbory s obrázkami</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1700,27 +1712,27 @@ vybraný počítač?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Výška</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Plánovaný čas ponoru</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>ATM tlak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1733,37 +1745,37 @@ vybraný počítač?</translation> <translation>neznámy</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Cieľová hĺbka</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Aktuálny čas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Použitá zmes</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC SetPoint</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Vymazať plán?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Chystáš sa vymazať svoj plán.</translation> </message> @@ -1785,6 +1797,11 @@ vybraný počítač?</translation> <source>Add dive data point</source> <translation>Pridať data point ponoru</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1883,7 +1900,7 @@ vybraný počítač?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1919,127 +1936,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Dátum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Hodnotenie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation>Záťaž(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Oblek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Fľaša</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation>Zmes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Max. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Miesto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation>Hĺbka(%1)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation>Tepl(%1%2)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2261,6 +2278,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2269,7 +2299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2315,8 +2345,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2324,7 +2354,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Miesto</translation> </message> @@ -2365,27 +2395,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Poznámky</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Teplota vzduchu</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Teplota vody</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Poznámky</translation> </message> @@ -2435,6 +2465,16 @@ p, li { white-space: pre-wrap; } <translation>Spotreba plynu</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2507,91 +2547,91 @@ p, li { white-space: pre-wrap; } <translation>Fotografie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Fľaše</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Pridaj fľašu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Závažia</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Pridaj závažia</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Uložiť</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Teplota vzduchu [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Teplota vody [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Táto akcia je editovaná.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Viaceré ponory sú editované.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Tento ponor sa edituje.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Poznámky</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Najhlbší ponor</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Najplytší ponor</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2600,17 +2640,17 @@ vytvorene zo vzduchu a: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>a</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Vymazať zmeny?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Chystáš sa vymazať zmeny.</translation> </message> @@ -2937,18 +2977,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3132,60 +3171,60 @@ p, li { white-space: pre-wrap; } <translation>Vytlačiť runtime tabuľku</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Chceš uložiť zmeny prevedené v súbore %1?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Chces uložiť zmeny prevedené v dátovom súbore?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Uložiť zmeny?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Uložiť súbor ako</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Otvoriť log súbor</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>Zmeny budu stratené ak ich neuložíš.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Upozornenie</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ulož alebo zruš aktuálne editovanie ponoru pred otvorením nového súboru.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ukonči aktuálne editovanie pred tým než začneš ďalšie.</translation> </message> @@ -3193,54 +3232,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Posledná zastávka v 20 stopách</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% priemernej hĺbky do 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft na hladinu</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Posledná zastávka v 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% priemernej hĺbky do 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m na povrch</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation>cuft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation>ℓ/min</translation> </message> @@ -3755,72 +3794,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>neznámy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Ponor #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Max hĺbka: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Trvanie: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Použitá zmes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Značky:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Závažia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Poznámky:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Viď:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Hodnotenie:</translation> </message> @@ -3951,42 +3990,42 @@ p, li { white-space: pre-wrap; } <translation>Posuň mapu a dvojklikom označ miesto ponoru</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4267,7 +4306,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4275,17 +4314,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Popis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4513,12 +4552,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Popis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4579,17 +4618,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Kliknutím sem vymažeš tento záťažový systém.</translation> </message> @@ -4610,76 +4649,76 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Rok > Mesiac / Akcia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Trvanie Celkové</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation>Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation>Najkratší</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation>Najdlhší</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Hĺbka (%1) Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4689,29 +4728,29 @@ Maximum</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4719,56 +4758,56 @@ Maximum</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) alebo (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>vzduch</translation> </message> @@ -4799,31 +4838,31 @@ Maximum</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Chyba pri načítaní '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximálny počet podporovaných stĺpcov pre CSV import je %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>žiaden</translation> </message> @@ -4831,7 +4870,7 @@ Maximum</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dekompresná zastávka</translation> </message> @@ -4843,52 +4882,52 @@ Maximum</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>výstup</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>strop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>záťaž</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>vysielač</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>prekročenie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>poznámka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>povrch</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>bezpečnostná zastávka</translation> </message> @@ -4896,202 +4935,212 @@ Maximum</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>zmena plynu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>bezpečnostná zastávka (dobrovoľná)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>bezpečnostná zastávka (povinná)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>hĺbková zastávka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>strop (bezpečnostná zastávka)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>čas ponoru</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>pod stropom</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>max. hĺbka</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>čas na vzduchu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>smer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>upozornenie nasýtenia tkanív</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>non stop čas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>neplatné číslo udalosti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Nie je možné spracovať %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Chyba registrácie dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Chyba spracovania času</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Ponor #%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Chyba spracovania času ponoru</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Chyba spracovania maximálnej hĺbky</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Chyba spracovania dýchacích zmesí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Chyba získania slanosti vody</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Chyba pri zisťovaní tlaku na povrchu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Chyba spracovania zmesi plynu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Chyba spracovania vzoriek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Udalosť: Čakanie na vstup uživateľa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Chyba registrácia správcu udalosti.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrácie správcu ukončenia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Chyba importu dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Problém inicializácie libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Nie je možné otvoriť %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Zvláštne percenta v %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Chyba pri spracovaní '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Neúspešná požiadavka: get_events.⏎ </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Databázová požiadavka get_tags zlýhala. @@ -5105,36 +5154,36 @@ Maximum</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Požiadavka na databázu zlyhala '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Databázová požiadavka get_cylinders zlýhala. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Databázová požiadavka get_changes zlyhala. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Databázová požiadavka get_profile_sample zlyhala. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Neviem otvoriť šablónu </translation> </message> @@ -5144,7 +5193,7 @@ Maximum</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Neviem nájsť zmes %s</translation> </message> @@ -5228,16 +5277,21 @@ Maximum</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Spotreba plynu: </translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Upozornenie:</translation> </message> @@ -5247,37 +5301,37 @@ Maximum</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>toto je väčšie množstvo plynu než je k dispozícií v danej fľaši!</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>žiadna rezerva pre zdieľanie zmesi počas výstupu!</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s z %s (%.0f%s/%.0f%s v plánovanom výstupe)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s počas plánovaného výstupu) z %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>vysoká pO₂ hodnota %.2f v %d:%02u so zmesou %s v hĺbke %.*f %s</translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5286,70 +5340,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5358,7 +5412,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5367,142 +5421,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Bezpečnostná zastávka: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Bezpečnostná zastávka: neznáma @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: neznáma @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>In deco </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deco: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>V deco (calc) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Vypočítaný strop %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Tkanivo %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>tep srdca: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>smer: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5622,7 +5676,7 @@ EADD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5672,97 +5726,97 @@ EADD: %d%s <translation>(žiadné ponory)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Ne</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Po</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Ut</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>St</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Št</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Pi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>So</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Dec</translation> </message> diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index 43aa72f6e..c06a1f139 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -18,7 +18,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> + <location filename="../qt-ui/models.cpp" line="2446"/> <source>No buddies</source> <translation type="unfinished"></translation> </message> @@ -932,57 +932,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"></translation> </message> @@ -1077,22 +1077,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation type="unfinished"></translation> </message> @@ -1120,97 +1120,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation type="unfinished"></translation> </message> @@ -1218,87 +1218,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"></translation> </message> @@ -1711,27 +1711,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation type="unfinished"></translation> </message> @@ -1744,37 +1744,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation type="unfinished"></translation> </message> @@ -1796,6 +1796,11 @@ <source>Add dive data point</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1930,127 +1935,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation type="unfinished"></translation> </message> @@ -2271,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2325,7 +2343,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> + <location filename="../qt-ui/models.cpp" line="2569"/> <source>No location set</source> <translation type="unfinished"></translation> </message> @@ -2334,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation type="unfinished"></translation> </message> @@ -2375,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation type="unfinished"></translation> </message> @@ -2445,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2517,108 +2545,108 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation type="unfinished"></translation> </message> @@ -3135,60 +3163,60 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto files(*.sde *.db);;CSV files(*.csv);;MkVI files(*.txt);;All files(*)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"></translation> </message> @@ -3196,54 +3224,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"></translation> </message> @@ -3758,72 +3786,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation type="unfinished"></translation> </message> @@ -3954,42 +3982,42 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation type="unfinished"></translation> </message> @@ -4270,7 +4298,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"></translation> </message> @@ -4278,17 +4306,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation type="unfinished"></translation> </message> @@ -4513,12 +4541,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation type="unfinished"></translation> </message> @@ -4579,17 +4607,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation type="unfinished"></translation> </message> @@ -4610,70 +4638,70 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation type="unfinished"></translation> @@ -4682,29 +4710,29 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4712,56 +4740,56 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation type="unfinished"></translation> </message> @@ -4792,31 +4820,31 @@ Maximum</source> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation type="unfinished"></translation> </message> @@ -4824,7 +4852,7 @@ Maximum</source> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation type="unfinished"></translation> </message> @@ -4836,52 +4864,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation type="unfinished"></translation> </message> @@ -4889,200 +4917,210 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation type="unfinished"></translation> @@ -5094,32 +5132,32 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"></translation> </message> @@ -5129,7 +5167,7 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation type="unfinished"></translation> </message> @@ -5210,15 +5248,20 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation type="unfinished"></translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation type="unfinished"></translation> </message> @@ -5228,231 +5271,231 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../planner.c" line="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation type="unfinished"></translation> </message> @@ -5572,7 +5615,7 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation type="unfinished"></translation> </message> @@ -5622,97 +5665,97 @@ EADD: %d%s <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation type="unfinished"></translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index 81508f274..ae100884b 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Storlek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Arbetstryck</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Starttryck</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Sluttryck</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Byt vid</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Klicka här för att ta bort denna flaska</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Flaska kan inte tas bort</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denna gas används. Bara flaskor som inte används kan tas bort.</translation> </message> @@ -1064,22 +1076,22 @@ radera den valda dykdatorn?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Enhetsid</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Enhetsnamn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Klicka här för att ta bort denna dykdator</translation> </message> @@ -1107,97 +1119,97 @@ radera den valda dykdatorn?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Dräkt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Plats</translation> </message> @@ -1205,87 +1217,87 @@ radera den valda dykdatorn?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Expandera alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Sammanslå alla</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Fäll samman andra</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Ta bort dyk från resa</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>Ny resa ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <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="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <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="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>Sammanfoga resa med resan ovan</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>Sammanfoga resa med resan under</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Radera dyk(en)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>Markera dyk som ogiltiga</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Slå samman valda dyk</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Uppdatera numrering</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Förskjut tid</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Ladda bilder</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Öppna bildfler</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ radera den valda dykdatorn?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>Höjd</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Planerad dyktid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Atmosfärstryck</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ radera den valda dykdatorn?</translation> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Slutdjup</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Löptid</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Använd gas</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>CC set point</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>Kassera plan?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>Du kommer kassera din plan</translation> </message> @@ -1783,6 +1795,11 @@ radera den valda dykdatorn?</translation> <source>Add dive data point</source> <translation>lägg till dykdatapunkt</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ radera den valda dykdatorn?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Rankning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Temp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Dräkt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Cyl</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Max CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Plats</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,8 +2297,8 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> - <translation>Textettikett</translation> + <source>Text label</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Plats</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Dykanteckningar</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Lufttemp</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Vattentemperatur</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Anteckningar</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation>Gasförbrukning</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,91 +2545,91 @@ p, li { white-space: pre-wrap; } <translation>Bilder</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Flaskor</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Lägg till flaska</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Vikter</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Lägg till Viktsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Spara</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Lufttemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Vattentemperatur [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <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="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <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="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <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="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Resmålsanteckningar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Resmål</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Djupaste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Grundaste dyk</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2598,17 +2638,17 @@ mixas av luft och: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>och</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Kassera ändringarna?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>Du är påväg att kasta bort dina förändringar</translation> </message> @@ -2935,18 +2975,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3130,60 +3169,60 @@ p, li { white-space: pre-wrap; } <translation>Skriv ut körtidstabell</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Spara ändringar?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Öppna dyklogg</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <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="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Varning</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <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="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <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> @@ -3191,54 +3230,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>Sista stoppet på 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% av snittdjup till 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>20ft till ytan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Sista stoppet på 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% av snittdjup till 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>6m till ytan</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3753,72 +3792,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Dyk #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Maxdjup: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Varaktighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Gas använd:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Taggar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Vikter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Anteckningar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>Parkamrat:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>Dräkt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Ranking:</translation> </message> @@ -3949,42 +3988,42 @@ p, li { white-space: pre-wrap; } <translation>Flytta runt kartan och dubbelklicka för att ställa in dykplats</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>ft³</translation> </message> @@ -4265,7 +4304,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4273,17 +4312,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Beskrivning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4509,12 +4548,12 @@ OS CPU Arkitektur: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Beskrivning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4575,17 +4614,17 @@ OS CPU Arkitektur: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Klicka här för att ta bort detta viktsystem.</translation> </message> @@ -4606,76 +4645,76 @@ OS CPU Arkitektur: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>År > Månad / Resa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Varaktighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation>Genomsnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation>Kortaste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation>Längsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Djup (%1) Medel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Medel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -4685,29 +4724,29 @@ Medel</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>ft³</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4715,56 +4754,56 @@ Medel</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>luft</translation> </message> @@ -4795,31 +4834,31 @@ Medel</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Kunde inte öppna '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>Maximalt antalet kolumner i CSV import är %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>inget</translation> </message> @@ -4827,7 +4866,7 @@ Medel</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dekostopp</translation> </message> @@ -4839,52 +4878,52 @@ Medel</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>uppstigning</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>arbetsbelastning</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>sändare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>kränkning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>bokmärke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>ytan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>säkerhetsstopp</translation> </message> @@ -4892,202 +4931,212 @@ Medel</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>gasbyte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>säkerhetsstopp (frivilligt)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>säkerhetsstopp (obligatoriskt)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>djupstopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>ceiling (säkerhetsstopp)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>dyktid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>under golv</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>Maxdjup</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>gastid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>riktning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>vävnadsnivå</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>non stop tid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>okänt händelsenummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Kan inte skapa parser för %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Kunde inte registrera parser-data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Kunde inte tolka tid och datum</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>Dyk #%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Kunde inte tolka dyktid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Kunde inte tolka maxdjup</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Kunde inte tolka antal gasblandningar</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Kunde inte ladda vattnets salthalt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Kunde inte få tag i tyck vid ytan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Kunde inte tolka gasblandning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Kunde inte tolka sampel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Händelse: väntar på användaren</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Kunde inte registrera event-funktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Kunde inte registrera avbrytningsrutin</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Lyckades inte importera dykdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Kan inte skapa libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Kunde inte öppna fil %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Konstig procent läsning %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Kunde inte läsa '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Databasfråga get_events misslyckades. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>Databasfrågan get_tags misslyckades. @@ -5101,36 +5150,36 @@ Medel</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Databasfråga misslyckades '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>Databasfrågan get_cylinders misslyckades. </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>Databasfrågan get_changes misslyckades. </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>Databasfrågan get_profile_sample misslyckades. </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>Kunde inte öppna formatmall %s</translation> </message> @@ -5140,7 +5189,7 @@ Medel</translation> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>Kan inte hitta gas %s</translation> </message> @@ -5221,15 +5270,20 @@ Medel</translation> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gasförbrukning:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Varning:</translation> </message> @@ -5239,37 +5293,37 @@ Medel</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <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="677"/> + <location filename="../planner.c" line="680"/> <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="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <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="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5278,70 +5332,70 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5350,7 +5404,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5359,142 +5413,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>Säkerhetsstopp: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>Säkerhetsstopp: okänd tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deko: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deko: okänd tid @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>I Deko </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Deko: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>I deko (calc) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>Beräknat tak %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>Vävnad %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>hjärtrytm: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>kurs: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5614,7 +5668,7 @@ EADD: %d%s <translation>deko</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5664,97 +5718,97 @@ EADD: %d%s <translation>(inga dyk)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>sön</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>mån</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>tis</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>lör</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>maj</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>dec</translation> </message> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index 70e50a229..5192c58f1 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Tür</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Boyut</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Çalışma basıncı</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Başlangıç basıncı</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Bitiş basıncı</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Buraya tıklayarak bu tüp kaldırılır.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Tüp kaldırılamaz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -1064,22 +1076,22 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Cihaz Kimliği</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Rumuz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Buraya tıklayarak dalış bilgisayarını kaldır.</translation> </message> @@ -1107,97 +1119,97 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OZB</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>Azami MSS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Konum</translation> </message> @@ -1205,87 +1217,87 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Hepsini aç</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Geziden dalış kaldır</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Dalış sil</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Seçili dalışları birleştir</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Dalışları yeniden numaralandır</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Görüntüleri yükle</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Görüntü dosyalarını aç</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ kaldırmak istediğinizden emin misiniz?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>İrtifa</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>Planlanan dalış zamanı</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>Atmosfer basıncı</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ kaldırmak istediğinizden emin misiniz?</translation> <translation>bilinmeyen</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>Final derinlik</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>Çalışma süresi</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>Gaz kullanımı</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>KD set noktası</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -1783,6 +1795,11 @@ kaldırmak istediğinizden emin misiniz?</translation> <source>Add dive data point</source> <translation>Dalış veri noktası ekle</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ kaldırmak istediğinizden emin misiniz?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Tarih</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Değerlendirme</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Derinlik</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Ağırlık</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>Azami MSS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Konum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Süre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OZB</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Konum</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>Dalış notları</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>Hava sıcaklığı.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>Su sıcaklığı.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Notlar</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation>Gaz tüketimi</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,108 +2545,108 @@ p, li { white-space: pre-wrap; } <translation>Fotoğraflar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Tüpler</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>Tüp ekle</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>Ağırlıklar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>Ağırlık Sistemi Ekle</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Kaydet</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>İptal</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>Hava sıcaklığı. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>Su sıcaklığı. [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>Bu gezi düzenleniyor.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>Çoklu dalış düzenleniyor.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>Bu dalış düzenleniyor.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>Gezi notları</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>Gezi konumu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>Derin dalış</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>Sığ dalış</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>ve</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>Değişiklikleri silinsin mi ?</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2929,18 +2969,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3124,60 +3163,60 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>%1 dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Veri dosyasında yapılan değişiklikleri kaydetmek istiyor musunuz?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>Değişiklikler kaydedilsin mi ?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>Dalış kayıt dosyasını aç</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>Uyarı</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lütfen yeni bir dosya açmadan önce geçerli dalışı düzenle, kaydet veya iptal et.</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML dosyaları (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3185,54 +3224,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>fit/dak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>20 fit son durak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>Yüzeye 20 fit</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/dak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>6m son durak</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>yüzeye 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3747,72 +3786,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>bilinmeyen</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>Dalış #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>Azami derinlik: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>Süre: %1 dak</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>Gaz kullanımı:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>Etiketler:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>Ağırlıklar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>Notlar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>Divemaster(Dalış lideri):</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>Değerlendirme:</translation> </message> @@ -3943,42 +3982,42 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>fitküp</translation> </message> @@ -4259,7 +4298,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4267,17 +4306,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>Tanımlama</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4505,12 +4544,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>Tanımlama</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4571,17 +4610,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Tür</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Ağırlık</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>Ağırlık sistemi buraya tıklayarak kaldırılır.</translation> </message> @@ -4602,78 +4641,78 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>Yıl > Ay / Seyahat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>Süre Toplam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> Ortalama</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> Kısa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> Uzun</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>Derinlik (%1) Ortalama</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> Asgari</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> Azami</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>Sıcaklık (%1) @@ -4683,29 +4722,29 @@ Ortalama</translation> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>paskal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>fitküp</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4713,56 +4752,56 @@ Ortalama</translation> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>fit</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/dak</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/san</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>fit/dak</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>fit/san</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>libre</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) veya (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>hava</translation> </message> @@ -4793,31 +4832,31 @@ Ortalama</translation> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>'%s' okunamadı</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>hiçbiri</translation> </message> @@ -4825,7 +4864,7 @@ Ortalama</translation> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation type="unfinished"/> </message> @@ -4837,52 +4876,52 @@ Ortalama</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>kdz</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>çıkış</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>tavan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>iş yükü</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>yerimi</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>yüzey</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>güvenlik durağı</translation> </message> @@ -4890,200 +4929,210 @@ Ortalama</translation> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>gazdeğişimi</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>güvenlik durağı (gönüllü)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>güvenlik durağı (zorunlu)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>Tavan (güvenlik durağı)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>dalış zamanı</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>azamiderinlik</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLB</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>igbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>doku seviye uyarısı</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>geçersiz olay numarası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Veri kaydedilirken hata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Tarih saat ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Dalış zamanı ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Azami derinlik ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Gaz karışım sayısını ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Su tuzluluğu edinme hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>Yüzey basıncı edinme hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Gaz karışımı ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Örnekleri ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Olay: kullanıcı eylemi bekleniyor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>model=%u (0x%08x), firmware=%u (0x%08x), seri=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Olay işleyicisi kayıt hatası.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Dalış verisi içe aktarma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> @@ -5096,33 +5145,33 @@ Ortalama</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Veritabanı sorgusu başarısız '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5132,7 +5181,7 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>%s gaz bulunamıyor</translation> </message> @@ -5213,15 +5262,20 @@ Ortalama</translation> <translation>OZB</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>Gaz tüketimi:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>Uyarı:</translation> </message> @@ -5231,103 +5285,103 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>MSS: %u%% </translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar </translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5336,7 +5390,7 @@ EHYD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5345,130 +5399,130 @@ EHYD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %udak @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>Deco: bilinmeyen zaman @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>YZ: %udak </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>YZ: %udak (hesap) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> @@ -5588,7 +5642,7 @@ EHYD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5638,97 +5692,97 @@ EHYD: %d%s <translation>(dalış yok)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>Pazar</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>Pazartesi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>Salı</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>Çarşamba</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>Perşembe</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>Cuma</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>Cumartesi</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Ocak</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Şubat</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Mart</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Nisan</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Mayıs</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Haziran</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Temmuz</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Ağustos</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Eylül</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Ekim</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Kasım</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Aralık</translation> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index c615aa5aa..a7a9f92cc 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>Loại</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>Kích thước</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>Anh ấy%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>Ấn làm việc.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>Ấn bắt đầu.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>Ấn kết thúc.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>Chuyển đổi tại</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>Click vào đây sẽ loại bỏ này xi lanh.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>Xi lanh không thể được gỡ bỏ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <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> @@ -1064,22 +1076,22 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>Mô hình</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>Số hiệu Thiết Bị</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>Tên</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>Click vào đây sẽ loại bỏ thông tin về máy lặn này.</translation> </message> @@ -1107,97 +1119,97 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>Xlanh</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -1205,87 +1217,87 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>Loại bỏ (các)máy lặn từ chuyến đi</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <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="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <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="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <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="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <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="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <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="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>Xóa (các)lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <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="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>Hợp nhất các lần lặn được chọn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>Đánh dấu lại (các)lần lặn</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>Chuyển thời gian</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>Tải hình ảnh</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>Mở tập tin hình ảnh</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ bỏ các máy lặn đã được chọn?</translation> <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ bỏ các máy lặn đã được chọn?</translation> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation type="unfinished"/> </message> @@ -1783,6 +1795,11 @@ bỏ các máy lặn đã được chọn?</translation> <source>Add dive data point</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ bỏ các máy lặn đã được chọn?</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>Ngày tháng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>Xếp hạng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>Đồ lặn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>Xlanh</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>Địa điểm</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>OTU</translation> </message> @@ -2258,6 +2275,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2266,7 +2296,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2312,8 +2342,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2321,7 +2351,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -2362,27 +2392,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>Ghi chú</translation> </message> @@ -2432,6 +2462,16 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2504,108 +2544,108 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>Xilanh</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>Lưu lại</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -2928,18 +2968,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3123,60 +3162,60 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> @@ -3184,54 +3223,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3746,72 +3785,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -3942,42 +3981,42 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4258,7 +4297,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4266,17 +4305,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4501,12 +4540,12 @@ OS CPU Architecture: %1</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>ký</translation> </message> @@ -4567,17 +4606,17 @@ OS CPU Architecture: %1</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>Loại</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation type="unfinished"/> </message> @@ -4598,70 +4637,70 @@ OS CPU Architecture: %1</source> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -4670,29 +4709,29 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4700,56 +4739,56 @@ Maximum</source> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation type="unfinished"/> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) hoặc (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>không khí</translation> </message> @@ -4780,31 +4819,31 @@ Maximum</source> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>Thất bại khi đọc dữ liệu '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>không</translation> </message> @@ -4812,7 +4851,7 @@ Maximum</source> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>dừng lại deco</translation> </message> @@ -4824,52 +4863,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>rbt</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>đường dốc</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>trần</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>tải công việc</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>máy phát radio</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>độ xâm phạm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>đánh dấu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>bề mặt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>dừng an toàn</translation> </message> @@ -4877,202 +4916,212 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>thay đổi dưỡng khí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>dừng an toàn (tự nguyện)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>dừng an toàn (bắt buộc)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>trần (độ an toàn)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>thời gian lặn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>độ sâu tối đa</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>thời gian không khí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>thẳng tiến</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>cảnh báo cấp độ mô</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>không dừng lại thời gian</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>chỉ số sự kiện không hợp lệ</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>Không thể tạo việc chuyển thông số cho %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>Lỗi khi đăng ký dữ liệu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>Lỗi khi chuyển thông số thời gian</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>Lỗi khi chuyển thông số thời gian lặn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>Lỗi khi chuyển thông số độ sâu tối đa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>Lỗi khi chuyển tiếp thông số số lượng hỗn hợp dưỡng khí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>Lỗi khi thu nhận độ mặn của nước</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>Lỗi khi chuyển thông số hỗn hợp dưỡng khí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>Lỗi khi chuyển thông số các mẫu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>Sự kiện: đang đợi thao tác từ người dùng</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>mô hình=%u (0x%08x), firmware=%u (0x%08x), số hiệu=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>Lỗi khi đăng ký quản lý sự kiện.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>Lỗi khi đăng ký việc hủy bỏ quản lý.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>Lỗi khi nhập dữ liệu lặn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>Không thể tạo nội dung cho thiết bị đo lặn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>Đang đọc tỉ lệ lạ %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>Thất bại khi chuyển thông số '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>Thất bại khi truy vấn việc nhận_sự kiện từ cơ sở dữ liệu. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation type="unfinished"/> @@ -5085,33 +5134,33 @@ Maximum</source> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>Thất bại khi truy vấn dữ liệu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -5121,7 +5170,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> @@ -5202,15 +5251,20 @@ Maximum</source> <translation>OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation type="unfinished"/> </message> @@ -5220,231 +5274,231 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <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="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation type="unfinished"/> </message> @@ -5564,7 +5618,7 @@ EADD: %d%s <translation>deco</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation type="unfinished"/> </message> @@ -5614,97 +5668,97 @@ EADD: %d%s <translation>(không có cuộc lặn nào)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>CN</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>T2</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>T3</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>T4</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>T5</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>T6</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>T7</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>Th1</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>Th2</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>Th3</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>Th5</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>Th6</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>Th7</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>Th8</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>Th9</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>Th10</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>Th11</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>Th12</translation> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index 3f2063027..c15cc8786 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -9,15 +9,15 @@ </message> <message> <location filename="../qt-ui/simplewidgets.cpp" line="488"/> - <source>Searches for Buddies and Divemasters</source> + <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2430"/> - <source>No Buddies</source> + <location filename="../qt-ui/models.cpp" line="2446"/> + <source>No buddies</source> <translation type="unfinished"/> </message> </context> @@ -45,7 +45,7 @@ </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> - <source>Device settings successfully resetted</source> + <source>Device settings successfully reset</source> <translation type="unfinished"/> </message> </context> @@ -348,11 +348,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> - <source>Suunto Vyper Family</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="189"/> <source>OSTC, Mk.2/2N/2C</source> <translation type="unfinished"/> @@ -409,7 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> <source>Advanced Settings</source> <translation type="unfinished"/> @@ -421,6 +415,16 @@ <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> + <source>Suunto Vyper family</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="605"/> + <source>Advanced settings</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1826"/> <source>Future TTS</source> @@ -656,12 +660,25 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <source>ppO₂ max</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <source>ppO₂ min</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO2 max</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO2 min</source> <translation type="unfinished"/> @@ -731,11 +748,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total divetime</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1480"/> <source>Computer model</source> <translation type="unfinished"/> @@ -918,57 +930,57 @@ <context> <name>CylindersModel</name> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Type</source> <translation>類型</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Size</source> <translation>容量</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>He%</source> <translation>He%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>O</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Work press.</source> <translation>工作壓力</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>Start press.</source> <translation>開始壓力</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="76"/> + <location filename="../qt-ui/models.cpp" line="79"/> <source>End press.</source> <translation>結束壓力</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="77"/> + <location filename="../qt-ui/models.cpp" line="80"/> <source>Switch at</source> <translation>交換於</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="186"/> + <location filename="../qt-ui/models.cpp" line="189"/> <source>Clicking here will remove this cylinder.</source> <translation>於此處按下將移除此氣瓶.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="394"/> + <location filename="../qt-ui/models.cpp" line="397"/> <source>Cylinder cannot be removed</source> <translation>氣瓶無法移除</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="395"/> + <location filename="../qt-ui/models.cpp" line="398"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>此氣瓶仍在使用中，在潛水中，只有未使用的氣瓶可被移除。</translation> </message> @@ -1064,22 +1076,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Model</source> <translation>型號</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Device ID</source> <translation>裝置 ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1584"/> + <location filename="../qt-ui/models.cpp" line="1589"/> <source>Nickname</source> <translation>別名</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1620"/> + <location filename="../qt-ui/models.cpp" line="1625"/> <source>Clicking here will remove this dive computer.</source> <translation>點擊這裡移除此潛水電腦。</translation> </message> @@ -1107,97 +1119,97 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1216"/> + <location filename="../qt-ui/models.cpp" line="1221"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1219"/> + <location filename="../qt-ui/models.cpp" line="1224"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1222"/> + <location filename="../qt-ui/models.cpp" line="1227"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1225"/> + <location filename="../qt-ui/models.cpp" line="1230"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1228"/> + <location filename="../qt-ui/models.cpp" line="1233"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1231"/> + <location filename="../qt-ui/models.cpp" line="1236"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1234"/> + <location filename="../qt-ui/models.cpp" line="1239"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1237"/> + <location filename="../qt-ui/models.cpp" line="1242"/> <source>Suit</source> <translation>防寒衣</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1240"/> + <location filename="../qt-ui/models.cpp" line="1245"/> <source>Cyl</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1243"/> + <location filename="../qt-ui/models.cpp" line="1248"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1248"/> + <location filename="../qt-ui/models.cpp" line="1253"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1251"/> + <location filename="../qt-ui/models.cpp" line="1256"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1254"/> + <location filename="../qt-ui/models.cpp" line="1259"/> <source>Max CNS</source> <translation>最大 CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1257"/> + <location filename="../qt-ui/models.cpp" line="1262"/> <source>Location</source> <translation>位置</translation> </message> @@ -1205,87 +1217,87 @@ <context> <name>DiveListView</name> <message> - <location filename="../qt-ui/divelistview.cpp" line="743"/> + <location filename="../qt-ui/divelistview.cpp" line="781"/> <source>Expand all</source> <translation>全部展開</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="744"/> + <location filename="../qt-ui/divelistview.cpp" line="782"/> <source>Collapse all</source> <translation>全部摺疊</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="745"/> + <location filename="../qt-ui/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>摺疊其它</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="747"/> + <location filename="../qt-ui/divelistview.cpp" line="785"/> <source>Remove dive(s) from trip</source> <translation>從旅程中移除潛水記錄(多支)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="748"/> + <location filename="../qt-ui/divelistview.cpp" line="786"/> <source>Create new trip above</source> <translation>設定為新的旅程</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="762"/> + <location filename="../qt-ui/divelistview.cpp" line="800"/> <source>Add dive(s) to trip immediately above</source> <translation>於上方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="764"/> + <location filename="../qt-ui/divelistview.cpp" line="802"/> <source>Add dive(s) to trip immediately below</source> <translation>於下方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="768"/> + <location filename="../qt-ui/divelistview.cpp" line="806"/> <source>Merge trip with trip above</source> <translation>與上方旅程合併</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="769"/> + <location filename="../qt-ui/divelistview.cpp" line="807"/> <source>Merge trip with trip below</source> <translation>與下方旅程合併</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="773"/> + <location filename="../qt-ui/divelistview.cpp" line="811"/> <source>Delete dive(s)</source> <translation>刪除潛水記錄(多支)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="775"/> + <location filename="../qt-ui/divelistview.cpp" line="813"/> <source>Mark dive(s) invalid</source> <translation>標示為無效的潛水記錄(多支)</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="779"/> + <location filename="../qt-ui/divelistview.cpp" line="817"/> <source>Merge selected dives</source> <translation>合併所選擇的潛水記錄</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="781"/> + <location filename="../qt-ui/divelistview.cpp" line="819"/> <source>Renumber dive(s)</source> <translation>為潛水記錄(多支)重新編號</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="782"/> + <location filename="../qt-ui/divelistview.cpp" line="820"/> <source>Shift times</source> <translation>移動時間</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="783"/> + <location filename="../qt-ui/divelistview.cpp" line="821"/> <source>Load images</source> <translation>載入影像</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Open image files</source> <translation>開啟影像檔</translation> </message> <message> - <location filename="../qt-ui/divelistview.cpp" line="804"/> + <location filename="../qt-ui/divelistview.cpp" line="842"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -1698,27 +1710,27 @@ <context> <name>DivePlanner</name> <message> - <location filename="../qt-ui/diveplanner.ui" line="134"/> + <location filename="../qt-ui/diveplanner.ui" line="156"/> <source>Altitude</source> <translation>海拔</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="106"/> + <location filename="../qt-ui/diveplanner.ui" line="109"/> <source>Planned dive time</source> <translation>計畫潛水時間</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="141"/> + <location filename="../qt-ui/diveplanner.ui" line="163"/> <source>ATM pressure</source> <translation>大氣壓力</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="148"/> + <location filename="../qt-ui/diveplanner.ui" line="170"/> <source>mbar</source> <translation>mbar</translation> </message> <message> - <location filename="../qt-ui/diveplanner.ui" line="161"/> + <location filename="../qt-ui/diveplanner.ui" line="183"/> <source>m</source> <translation>m</translation> </message> @@ -1731,37 +1743,37 @@ <translation>未知</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="683"/> + <location filename="../qt-ui/diveplanner.cpp" line="690"/> <source>Final depth</source> <translation>最後深度</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="685"/> + <location filename="../qt-ui/diveplanner.cpp" line="692"/> <source>Run time</source> <translation>持續時間</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="687"/> + <location filename="../qt-ui/diveplanner.cpp" line="694"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="689"/> + <location filename="../qt-ui/diveplanner.cpp" line="696"/> <source>Used gas</source> <translation>使用氣量</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="691"/> + <location filename="../qt-ui/diveplanner.cpp" line="698"/> <source>CC set point</source> <translation>密閉式循環設定點</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1024"/> + <location filename="../qt-ui/diveplanner.cpp" line="1031"/> <source>Discard the plan?</source> <translation>取消這次計畫?</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="1025"/> + <location filename="../qt-ui/diveplanner.cpp" line="1032"/> <source>You are about to discard your plan.</source> <translation>您將要放棄你的計劃.</translation> </message> @@ -1783,6 +1795,11 @@ <source>Add dive data point</source> <translation>新增潛水資料點</translation> </message> + <message> + <location filename="../qt-ui/diveplanner.cpp" line="303"/> + <source>Save New</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlotDataModel</name> @@ -1881,7 +1898,7 @@ </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> - <source>Get UserID</source> + <source>Get user ID</source> <translation type="unfinished"/> </message> <message> @@ -1917,127 +1934,127 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> - <location filename="../qt-ui/models.cpp" line="1457"/> + <location filename="../qt-ui/models.cpp" line="1416"/> + <location filename="../qt-ui/models.cpp" line="1462"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> - <location filename="../qt-ui/models.cpp" line="1460"/> + <location filename="../qt-ui/models.cpp" line="1419"/> + <location filename="../qt-ui/models.cpp" line="1465"/> <source>Date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1463"/> + <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1468"/> <source>Rating</source> <translation>評分</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1420"/> + <location filename="../qt-ui/models.cpp" line="1425"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1431"/> <source>Temp</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> + <location filename="../qt-ui/models.cpp" line="1434"/> <source>Weight</source> <translation>重量</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1441"/> + <location filename="../qt-ui/models.cpp" line="1446"/> <source>SAC</source> <translation>耗氣率</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Weight(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1478"/> + <location filename="../qt-ui/models.cpp" line="1437"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>Suit</source> <translation>防寒衣</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1435"/> - <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1440"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Cyl</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1438"/> - <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1443"/> + <location filename="../qt-ui/models.cpp" line="1489"/> <source>Gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>SAC(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1489"/> + <location filename="../qt-ui/models.cpp" line="1494"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1447"/> - <location filename="../qt-ui/models.cpp" line="1495"/> + <location filename="../qt-ui/models.cpp" line="1452"/> + <location filename="../qt-ui/models.cpp" line="1500"/> <source>Max CNS</source> <translation>最大 CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1450"/> - <location filename="../qt-ui/models.cpp" line="1498"/> + <location filename="../qt-ui/models.cpp" line="1455"/> + <location filename="../qt-ui/models.cpp" line="1503"/> <source>Location</source> <translation>位置</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1466"/> + <location filename="../qt-ui/models.cpp" line="1471"/> <source>Depth(%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> - <location filename="../qt-ui/models.cpp" line="1469"/> + <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1472"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source>Temp(%1%2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1475"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1444"/> - <location filename="../qt-ui/models.cpp" line="1492"/> + <location filename="../qt-ui/models.cpp" line="1449"/> + <location filename="../qt-ui/models.cpp" line="1497"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> @@ -2259,6 +2276,19 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>ExtraDataModel</name> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Key</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="2669"/> + <source>Value</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../qt-ui/listfilter.ui" line="14"/> @@ -2267,7 +2297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/listfilter.ui" line="22"/> - <source>TextLabel</source> + <source>Text label</source> <translation type="unfinished"/> </message> <message> @@ -2313,8 +2343,8 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2547"/> - <source>No Location set</source> + <location filename="../qt-ui/models.cpp" line="2569"/> + <source>No location set</source> <translation type="unfinished"/> </message> </context> @@ -2322,7 +2352,7 @@ p, li { white-space: pre-wrap; } <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="134"/> - <location filename="../qt-ui/maintab.cpp" line="469"/> + <location filename="../qt-ui/maintab.cpp" line="473"/> <source>Location</source> <translation>位置</translation> </message> @@ -2363,27 +2393,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="444"/> + <location filename="../qt-ui/maintab.cpp" line="448"/> <source>Dive notes</source> <translation>潛水筆記</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="72"/> <location filename="../qt-ui/maintab.ui" line="632"/> - <location filename="../qt-ui/maintab.cpp" line="258"/> + <location filename="../qt-ui/maintab.cpp" line="261"/> <source>Air temp.</source> <translation>氣溫</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="79"/> <location filename="../qt-ui/maintab.ui" line="651"/> - <location filename="../qt-ui/maintab.cpp" line="259"/> + <location filename="../qt-ui/maintab.cpp" line="262"/> <source>Water temp.</source> <translation>水溫</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="88"/> - <location filename="../qt-ui/maintab.cpp" line="470"/> + <location filename="../qt-ui/maintab.cpp" line="474"/> <source>Notes</source> <translation>記錄</translation> </message> @@ -2433,6 +2463,16 @@ p, li { white-space: pre-wrap; } <translation>氣體消耗</translation> </message> <message> + <location filename="../qt-ui/maintab.ui" line="958"/> + <source>Extra data</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/maintab.ui" line="970"/> + <source>Additional data from dive computer</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../qt-ui/maintab.ui" line="305"/> <location filename="../qt-ui/maintab.ui" line="442"/> <source>Date</source> @@ -2505,91 +2545,91 @@ p, li { white-space: pre-wrap; } <translation>照片</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="91"/> + <location filename="../qt-ui/maintab.cpp" line="94"/> <source>Cylinders</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="92"/> + <location filename="../qt-ui/maintab.cpp" line="95"/> <source>Add Cylinder</source> <translation>新增氣瓶</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="95"/> + <location filename="../qt-ui/maintab.cpp" line="98"/> <source>Weights</source> <translation>配重</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="96"/> + <location filename="../qt-ui/maintab.cpp" line="99"/> <source>Add Weight System</source> <translation>增加配重系統</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="51"/> + <location filename="../qt-ui/maintab.cpp" line="54"/> <source>Save</source> <translation>儲存</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="55"/> + <location filename="../qt-ui/maintab.cpp" line="58"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="255"/> + <location filename="../qt-ui/maintab.cpp" line="258"/> <source>Air temp. [%1]</source> <translation>氣溫 [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="256"/> + <location filename="../qt-ui/maintab.cpp" line="259"/> <source>Water temp. [%1]</source> <translation>水溫 [%1]</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="292"/> + <location filename="../qt-ui/maintab.cpp" line="296"/> <source>This trip is being edited.</source> <translation>此旅程已被編輯.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="299"/> + <location filename="../qt-ui/maintab.cpp" line="303"/> <source>Multiple dives are being edited.</source> <translation>此些旅程已被編輯.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="301"/> + <location filename="../qt-ui/maintab.cpp" line="305"/> <source>This dive is being edited.</source> <translation>此潛水已被編輯.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="415"/> - <location filename="../qt-ui/maintab.cpp" line="439"/> + <location filename="../qt-ui/maintab.cpp" line="419"/> + <location filename="../qt-ui/maintab.cpp" line="443"/> <source>Trip notes</source> <translation>旅程筆記</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="437"/> + <location filename="../qt-ui/maintab.cpp" line="441"/> <source>Trip location</source> <translation>旅程位置</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="504"/> - <location filename="../qt-ui/maintab.cpp" line="536"/> - <location filename="../qt-ui/maintab.cpp" line="540"/> - <location filename="../qt-ui/maintab.cpp" line="544"/> + <location filename="../qt-ui/maintab.cpp" line="509"/> + <location filename="../qt-ui/maintab.cpp" line="541"/> + <location filename="../qt-ui/maintab.cpp" line="545"/> + <location filename="../qt-ui/maintab.cpp" line="549"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="533"/> + <location filename="../qt-ui/maintab.cpp" line="538"/> <source>Deepest dive</source> <translation>最深的潛水</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="534"/> + <location filename="../qt-ui/maintab.cpp" line="539"/> <source>Shallowest dive</source> <translation>最淺的潛水</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="587"/> + <location filename="../qt-ui/maintab.cpp" line="592"/> <source>These gases could be mixed from Air and using: </source> @@ -2598,17 +2638,17 @@ mixed from Air and using: </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="591"/> + <location filename="../qt-ui/maintab.cpp" line="596"/> <source> and </source> <translation>與</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="848"/> + <location filename="../qt-ui/maintab.cpp" line="870"/> <source>Discard the changes?</source> <translation>取消變更？</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="849"/> + <location filename="../qt-ui/maintab.cpp" line="871"/> <source>You are about to discard your changes.</source> <translation>您將要放棄您的變更。</translation> </message> @@ -2935,18 +2975,17 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> - <source>&Filter by Tags</source> + <source>&Filter by tags</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="843"/> - <source>Ctrl+F</source> + <location filename="../qt-ui/mainwindow.ui" line="855"/> + <source>Toggle tissue graph</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.ui" line="855"/> - <location filename="../qt-ui/mainwindow.ui" line="858"/> - <source>Toggle Tissue Graph</source> + <location filename="../qt-ui/mainwindow.ui" line="843"/> + <source>Ctrl+F</source> <translation type="unfinished"/> </message> <message> @@ -3130,60 +3169,60 @@ p, li { white-space: pre-wrap; } <translation>列印操作表格</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="751"/> + <location filename="../qt-ui/mainwindow.cpp" line="759"/> <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="753"/> + <location filename="../qt-ui/mainwindow.cpp" line="761"/> <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="758"/> + <location filename="../qt-ui/mainwindow.cpp" line="766"/> <source>Save changes?</source> <translation>儲存變更?</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1108"/> + <location filename="../qt-ui/mainwindow.cpp" line="1116"/> <source>Save file as</source> <translation>另存新檔</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1249"/> + <location filename="../qt-ui/mainwindow.cpp" line="1257"/> <source>Open dive log file</source> <translation>打開潛水日誌檔案</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1250"/> - <source>Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db *.can);;XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;Suunto Files(*.sde *.db);;CSV Files(*.csv);;MkVI Files(*.txt);;All Files(*)</source> + <location filename="../qt-ui/mainwindow.cpp" line="1258"/> + <source>Dive log files (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran files (*.can);;CSV files (*.csv);;DiveLog.de files (*.dld);;JDiveLog files (*.jlb);;Liquivision files (*.lvd);;MkVI files (*.txt);;Suunto files(*.sde *.db);;UDDF/UDCF files (*.uddf *.udcf);;XML files (*.xml);;All files(*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="759"/> + <location filename="../qt-ui/mainwindow.cpp" line="767"/> <source>Changes will be lost if you don't save them.</source> <translation>如果不進行儲存, 所做變更將會遺失.</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="250"/> <location filename="../qt-ui/mainwindow.cpp" line="385"/> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Warning</source> <translation>提醒</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="206"/> - <location filename="../qt-ui/mainwindow.cpp" line="1092"/> + <location filename="../qt-ui/mainwindow.cpp" line="1100"/> <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="1109"/> + <location filename="../qt-ui/mainwindow.cpp" line="1117"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../qt-ui/mainwindow.cpp" line="1281"/> + <location filename="../qt-ui/mainwindow.cpp" line="1297"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>請在嘗試其他編輯時先完成當前編輯</translation> </message> @@ -3191,54 +3230,54 @@ p, li { white-space: pre-wrap; } <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../qt-ui/diveplanner.cpp" line="472"/> + <location filename="../qt-ui/diveplanner.cpp" line="479"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="473"/> + <location filename="../qt-ui/diveplanner.cpp" line="480"/> <source>Last stop at 20ft</source> <translation>上一次在20英呎停留</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="474"/> + <location filename="../qt-ui/diveplanner.cpp" line="481"/> <source>50% avg. depth to 20ft</source> <translation>50% avg. depth to 20ft</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="475"/> + <location filename="../qt-ui/diveplanner.cpp" line="482"/> <source>20ft to surface</source> <translation>水面下 20 英尺</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="477"/> + <location filename="../qt-ui/diveplanner.cpp" line="484"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="478"/> + <location filename="../qt-ui/diveplanner.cpp" line="485"/> <source>Last stop at 6m</source> <translation>Last stop at 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="479"/> + <location filename="../qt-ui/diveplanner.cpp" line="486"/> <source>50% avg. depth to 6m</source> <translation>50% avg. depth to 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="480"/> + <location filename="../qt-ui/diveplanner.cpp" line="487"/> <source>6m to surface</source> <translation>水面下 6m</translation> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="483"/> - <location filename="../qt-ui/diveplanner.cpp" line="484"/> + <location filename="../qt-ui/diveplanner.cpp" line="490"/> + <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/diveplanner.cpp" line="492"/> - <location filename="../qt-ui/diveplanner.cpp" line="493"/> + <location filename="../qt-ui/diveplanner.cpp" line="499"/> + <location filename="../qt-ui/diveplanner.cpp" line="500"/> <source>ℓ/min</source> <translation type="unfinished"/> </message> @@ -3753,72 +3792,72 @@ p, li { white-space: pre-wrap; } <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2069"/> + <location filename="../qt-ui/models.cpp" line="2074"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2074"/> + <location filename="../qt-ui/models.cpp" line="2079"/> <source>Dive #%1 - %2</source> <translation>潛水 #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2077"/> + <location filename="../qt-ui/models.cpp" line="2082"/> <source>Max depth: %1 %2</source> <translation>最大深度: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2084"/> + <location filename="../qt-ui/models.cpp" line="2089"/> <source>Duration: %1 min</source> <translation>區間: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2089"/> + <location filename="../qt-ui/models.cpp" line="2094"/> <source>Gas used:</source> <translation>消耗氣體: </translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2091"/> + <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> <translation>標籤:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2093"/> + <location filename="../qt-ui/models.cpp" line="2098"/> <source>SAC:</source> <translation>耗氣率: </translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2095"/> + <location filename="../qt-ui/models.cpp" line="2100"/> <source>Weights:</source> <translation>配重:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2100"/> + <location filename="../qt-ui/models.cpp" line="2105"/> <source>Notes:</source> <translation>記錄:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2107"/> + <location filename="../qt-ui/models.cpp" line="2112"/> <source>Divemaster:</source> <translation>導潛:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2109"/> + <location filename="../qt-ui/models.cpp" line="2114"/> <source>Buddy:</source> <translation>潛伴:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2111"/> + <location filename="../qt-ui/models.cpp" line="2116"/> <source>Suit:</source> <translation>防寒衣：</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2113"/> + <location filename="../qt-ui/models.cpp" line="2118"/> <source>Viz:</source> <translation>能見度:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2115"/> + <location filename="../qt-ui/models.cpp" line="2120"/> <source>Rating:</source> <translation>評分:</translation> </message> @@ -3949,42 +3988,42 @@ p, li { white-space: pre-wrap; } <translation>在地圖上移動, 並且雙擊來設定潛水位置</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="507"/> + <location filename="../qt-ui/models.cpp" line="512"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="508"/> + <location filename="../qt-ui/models.cpp" line="513"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="532"/> + <location filename="../qt-ui/models.cpp" line="537"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="533"/> + <location filename="../qt-ui/models.cpp" line="538"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="556"/> + <location filename="../qt-ui/models.cpp" line="561"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="557"/> + <location filename="../qt-ui/models.cpp" line="562"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="581"/> + <location filename="../qt-ui/models.cpp" line="586"/> <source>l</source> <translation>l</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="582"/> + <location filename="../qt-ui/models.cpp" line="587"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -4265,7 +4304,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2287"/> + <location filename="../qt-ui/models.cpp" line="2292"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4273,17 +4312,17 @@ p, li { white-space: pre-wrap; } <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>Description</source> <translation>描述</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="898"/> + <location filename="../qt-ui/models.cpp" line="903"/> <source>bar</source> <translation>bar</translation> </message> @@ -4512,12 +4551,12 @@ OS CPU 架構: %1</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>Description</source> <translation>描述</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="769"/> + <location filename="../qt-ui/models.cpp" line="774"/> <source>kg</source> <translation>kg</translation> </message> @@ -4578,17 +4617,17 @@ OS CPU 架構: %1</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Type</source> <translation>類型</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="416"/> + <location filename="../qt-ui/models.cpp" line="421"/> <source>Weight</source> <translation>重量</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="482"/> + <location filename="../qt-ui/models.cpp" line="487"/> <source>Clicking here will remove this weight system.</source> <translation>按此處移除配重系統。</translation> </message> @@ -4609,79 +4648,79 @@ OS CPU 架構: %1</translation> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1815"/> + <location filename="../qt-ui/models.cpp" line="1820"/> <source>Year > Month / Trip</source> <translation>年 > 月 / 旅程</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1818"/> + <location filename="../qt-ui/models.cpp" line="1823"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1821"/> + <location filename="../qt-ui/models.cpp" line="1826"/> <source>Duration Total</source> <translation>區間 全部</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1824"/> + <location filename="../qt-ui/models.cpp" line="1829"/> <source> Average</source> <translation> 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1827"/> + <location filename="../qt-ui/models.cpp" line="1832"/> <source> Shortest</source> <translation> 最短</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1830"/> + <location filename="../qt-ui/models.cpp" line="1835"/> <source> Longest</source> <translation> 最長</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1833"/> + <location filename="../qt-ui/models.cpp" line="1838"/> <source>Depth (%1) Average</source> <translation>深度 (%1) 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1836"/> - <location filename="../qt-ui/models.cpp" line="1845"/> - <location filename="../qt-ui/models.cpp" line="1854"/> + <location filename="../qt-ui/models.cpp" line="1841"/> + <location filename="../qt-ui/models.cpp" line="1850"/> + <location filename="../qt-ui/models.cpp" line="1859"/> <source> Minimum</source> <translation> 最小</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1839"/> - <location filename="../qt-ui/models.cpp" line="1848"/> - <location filename="../qt-ui/models.cpp" line="1857"/> + <location filename="../qt-ui/models.cpp" line="1844"/> + <location filename="../qt-ui/models.cpp" line="1853"/> + <location filename="../qt-ui/models.cpp" line="1862"/> <source> Maximum</source> <translation> 最大</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1842"/> + <location filename="../qt-ui/models.cpp" line="1847"/> <source>SAC (%1) Average</source> <translation>耗氣率 (%1) 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1851"/> + <location filename="../qt-ui/models.cpp" line="1856"/> <source>Temp. (%1) Average</source> <translation>溫度 (%1) @@ -4691,29 +4730,29 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../dive.c" line="167"/> + <location filename="../dive.c" line="181"/> <source>pascal</source> <translation>pascal</translation> </message> <message> - <location filename="../dive.c" line="172"/> + <location filename="../dive.c" line="186"/> <location filename="../qt-gui.cpp" line="338"/> <source>bar</source> <translation>bar</translation> </message> <message> - <location filename="../dive.c" line="176"/> + <location filename="../dive.c" line="190"/> <location filename="../qt-gui.cpp" line="341"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../dive.c" line="218"/> + <location filename="../dive.c" line="232"/> <source>cuft</source> <translation>cuft</translation> </message> <message> - <location filename="../dive.c" line="255"/> + <location filename="../dive.c" line="269"/> <location filename="../qt-gui.cpp" line="220"/> <location filename="../qt-gui.cpp" line="235"/> <location filename="../worldmap-save.c" line="44"/> @@ -4721,56 +4760,56 @@ Maximum</source> <translation>m</translation> </message> <message> - <location filename="../dive.c" line="260"/> + <location filename="../dive.c" line="274"/> <location filename="../qt-gui.cpp" line="223"/> <location filename="../qt-gui.cpp" line="237"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../dive.c" line="283"/> + <location filename="../dive.c" line="297"/> <source>m/min</source> <translation>m/min</translation> </message> <message> - <location filename="../dive.c" line="285"/> + <location filename="../dive.c" line="299"/> <source>m/s</source> <translation>m/s</translation> </message> <message> - <location filename="../dive.c" line="290"/> + <location filename="../dive.c" line="304"/> <source>ft/min</source> <translation>ft/min</translation> </message> <message> - <location filename="../dive.c" line="292"/> + <location filename="../dive.c" line="306"/> <source>ft/s</source> <translation>ft/s</translation> </message> <message> - <location filename="../dive.c" line="311"/> + <location filename="../dive.c" line="325"/> <location filename="../qt-gui.cpp" line="246"/> <location filename="../qt-gui.cpp" line="256"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../dive.c" line="315"/> + <location filename="../dive.c" line="329"/> <location filename="../qt-gui.cpp" line="244"/> <location filename="../qt-gui.cpp" line="254"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../dive.c" line="1429"/> + <location filename="../dive.c" line="1432"/> <source>(%s) or (%s)</source> <translation>(%s) 或 (%s)</translation> </message> <message> - <location filename="../divelist.c" line="460"/> + <location filename="../divelist.c" line="464"/> <location filename="../equipment.c" line="79"/> - <location filename="../planner.c" line="1000"/> <location filename="../planner.c" line="1003"/> + <location filename="../planner.c" line="1006"/> <source>air</source> <translation>air</translation> </message> @@ -4801,31 +4840,31 @@ Maximum</source> </message> <message> <location filename="../file.c" line="109"/> - <location filename="../file.c" line="396"/> - <location filename="../file.c" line="439"/> - <location filename="../file.c" line="722"/> + <location filename="../file.c" line="398"/> + <location filename="../file.c" line="456"/> + <location filename="../file.c" line="773"/> <source>Failed to read '%s'</source> <translation>無法讀取 '%s'</translation> </message> <message> - <location filename="../file.c" line="513"/> + <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="592"/> + <location filename="../file.c" line="643"/> <source>No matching DC found for file '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../file.c" line="675"/> - <location filename="../file.c" line="714"/> - <location filename="../file.c" line="804"/> + <location filename="../file.c" line="726"/> + <location filename="../file.c" line="765"/> + <location filename="../file.c" line="853"/> <source>Maximum number of supported columns on CSV import is %d</source> <translation>CSV 匯入最大支援 %d 欄位.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>none</source> <translation>無</translation> </message> @@ -4833,7 +4872,7 @@ Maximum</source> <location filename="../cochran.c" line="305"/> <location filename="../cochran.c" line="311"/> <location filename="../cochran.c" line="381"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>deco stop</source> <translation>減壓停留</translation> </message> @@ -4845,52 +4884,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>rbt</source> <translation>剩餘滯底時間</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ascent</source> <translation>上升</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>ceiling</source> <translation>上限深度</translation> </message> <message> - <location filename="../libdivecomputer.c" line="151"/> + <location filename="../libdivecomputer.c" line="141"/> <source>workload</source> <translation>工作量</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>transmitter</source> <translation>發射器</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>violation</source> <translation>違反</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>bookmark</source> <translation>書籤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>surface</source> <translation>水面</translation> </message> <message> - <location filename="../libdivecomputer.c" line="152"/> + <location filename="../libdivecomputer.c" line="142"/> <source>safety stop</source> <translation>安全停留</translation> </message> @@ -4898,202 +4937,212 @@ Maximum</source> <location filename="../cochran.c" line="361"/> <location filename="../cochran.c" line="410"/> <location filename="../cochran.c" line="417"/> - <location filename="../libdivecomputer.c" line="153"/> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="146"/> <source>gaschange</source> <translation>氣瓶更換</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (voluntary)</source> <translation>安全停留 (非必要)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="153"/> + <location filename="../libdivecomputer.c" line="143"/> <source>safety stop (mandatory)</source> <translation>安全停留 (強制性)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>deepstop</source> <translation>深停留</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>ceiling (safety stop)</source> <translation>上限深度 (安全停留)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>divetime</source> <translation>潛水時間</translation> </message> <message> - <location filename="../libdivecomputer.c" line="154"/> + <location filename="../libdivecomputer.c" line="144"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>below floor</translation> </message> <message> <location filename="../cochran.c" line="349"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>maxdepth</source> <translation>最大深度</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../cochran.c" line="354"/> <location filename="../cochran.c" line="400"/> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>airtime</source> <translation>空氣時間</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="155"/> + <location filename="../libdivecomputer.c" line="145"/> <source>heading</source> <translation>標題</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>tissue level warning</source> <translation>組織等級警告</translation> </message> <message> - <location filename="../libdivecomputer.c" line="156"/> + <location filename="../libdivecomputer.c" line="146"/> <source>non stop time</source> <translation>無停留時間</translation> </message> <message> - <location filename="../libdivecomputer.c" line="173"/> + <location filename="../libdivecomputer.c" line="163"/> <source>invalid event number</source> <translation>錯誤的事件編號</translation> </message> <message> - <location filename="../libdivecomputer.c" line="419"/> + <location filename="../libdivecomputer.c" line="442"/> <source>Unable to create parser for %s %s</source> <translation>無法建立解析 %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="425"/> + <location filename="../libdivecomputer.c" line="448"/> <source>Error registering the data</source> <translation>錯誤的登錄資料</translation> </message> <message> - <location filename="../libdivecomputer.c" line="433"/> + <location filename="../libdivecomputer.c" line="456"/> <source>Error parsing the datetime</source> <translation>日期時間解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="449"/> + <location filename="../libdivecomputer.c" line="472"/> <source>Dive %d: %s</source> <translation>潛水 %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="453"/> + <location filename="../libdivecomputer.c" line="476"/> <source>Error parsing the divetime</source> <translation>潛水時間解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="462"/> + <location filename="../libdivecomputer.c" line="485"/> <source>Error parsing the maxdepth</source> <translation>最大深度解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="471"/> + <location filename="../libdivecomputer.c" line="503"/> + <source>Error parsing temperature</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="522"/> <source>Error parsing the gas mix count</source> <translation>混合氣體數量解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="483"/> + <location filename="../libdivecomputer.c" line="534"/> <source>Error obtaining water salinity</source> <translation>得到錯誤的海水鹽度</translation> </message> <message> - <location filename="../libdivecomputer.c" line="491"/> + <location filename="../libdivecomputer.c" line="542"/> <source>Error obtaining surface pressure</source> <translation>得到錯誤的水面壓力</translation> </message> <message> - <location filename="../libdivecomputer.c" line="499"/> + <location filename="../libdivecomputer.c" line="566"/> + <source>Error obtaining divemode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../libdivecomputer.c" line="583"/> <source>Error parsing the gas mix</source> <translation>混合氣體解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="506"/> + <location filename="../libdivecomputer.c" line="590"/> <source>Error parsing the samples</source> <translation>樣本解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="643"/> + <location filename="../libdivecomputer.c" line="727"/> <source>Event: waiting for user action</source> <translation>事件: 等待使用者動作</translation> </message> <message> - <location filename="../libdivecomputer.c" line="651"/> + <location filename="../libdivecomputer.c" line="735"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>型號=%u (0x%08x), 韌體=%u (0x%08x), 序號=%u (0x%08x)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="711"/> + <location filename="../libdivecomputer.c" line="795"/> <source>Error registering the event handler.</source> <translation>錯誤的註冊程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="716"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Error registering the cancellation handler.</source> <translation>錯誤的註冊取消程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="737"/> + <location filename="../libdivecomputer.c" line="821"/> <source>Dive data import error</source> <translation>匯入潛水資料錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="776"/> + <location filename="../libdivecomputer.c" line="860"/> <source>Unable to create libdivecomputer context</source> <translation>無法建立 libdivecomputer 上下文</translation> </message> <message> - <location filename="../libdivecomputer.c" line="783"/> + <location filename="../libdivecomputer.c" line="867"/> <source>Unable to open %s %s (%s)</source> <translation> 無法開啟 %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="468"/> + <location filename="../parse-xml.c" line="481"/> <source>Strange percentage reading %s </source> <translation>有問題的讀取比例 %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1730"/> + <location filename="../parse-xml.c" line="1747"/> <source>Failed to parse '%s'</source> <translation>無法解析訊息 '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1958"/> + <location filename="../parse-xml.c" line="1975"/> <source>Database query get_events failed. </source> <translation>資料庫讀取 get_events 失敗. </translation> </message> <message> - <location filename="../parse-xml.c" line="1965"/> + <location filename="../parse-xml.c" line="1982"/> <source>Database query get_tags failed. </source> <translation>數據庫請求get_tags失敗</translation> @@ -5106,36 +5155,36 @@ Maximum</source> </translation> </message> <message> - <location filename="../parse-xml.c" line="1999"/> - <location filename="../parse-xml.c" line="2148"/> + <location filename="../parse-xml.c" line="2016"/> + <location filename="../parse-xml.c" line="2165"/> <source>Database query failed '%s'. </source> <translation>資料庫要求錯誤 '%s' . </translation> </message> <message> - <location filename="../parse-xml.c" line="2112"/> + <location filename="../parse-xml.c" line="2129"/> <source>Database query get_cylinders failed. </source> <translation>資料庫讀取 get_cylinders 失敗。 </translation> </message> <message> - <location filename="../parse-xml.c" line="2119"/> + <location filename="../parse-xml.c" line="2136"/> <source>Database query get_changes failed. </source> <translation>資料庫讀取 get_changes 失敗。 </translation> </message> <message> - <location filename="../parse-xml.c" line="2126"/> + <location filename="../parse-xml.c" line="2143"/> <source>Database query get_profile_sample failed. </source> <translation>資料庫讀取 get_profile_sample 失敗。 </translation> </message> <message> - <location filename="../parse-xml.c" line="2217"/> + <location filename="../parse-xml.c" line="2234"/> <source>Can't open stylesheet %s</source> <translation>無法開啟樣式 %s</translation> </message> @@ -5145,7 +5194,7 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../planner.c" line="766"/> + <location filename="../planner.c" line="769"/> <source>Can't find gas %s</source> <translation>無法找到氣體 %s</translation> </message> @@ -5226,15 +5275,20 @@ Maximum</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../planner.c" line="651"/> + <location filename="../planner.c" line="652"/> + <source>Gas consumption (CCR legs excluded):</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../planner.c" line="654"/> <source>Gas consumption:</source> <translation>氣體消耗:</translation> </message> <message> <location filename="../planner.c" line="533"/> - <location filename="../planner.c" line="671"/> - <location filename="../planner.c" line="676"/> - <location filename="../planner.c" line="699"/> + <location filename="../planner.c" line="674"/> + <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="702"/> <source>Warning:</source> <translation>提醒:</translation> </message> @@ -5244,37 +5298,37 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../planner.c" line="672"/> + <location filename="../planner.c" line="675"/> <source>this is more gas than available in the specified cylinder!</source> <translation>指定的氣瓶氣體超過供給量！</translation> </message> <message> - <location filename="../planner.c" line="677"/> + <location filename="../planner.c" line="680"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>無足夠的預留氣體可供上升使用！</translation> </message> <message> - <location filename="../planner.c" line="679"/> + <location filename="../planner.c" line="682"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s 在計畫上升中)</translation> </message> <message> - <location filename="../planner.c" line="681"/> + <location filename="../planner.c" line="684"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s 在計畫上升期間) of %s</translation> </message> <message> - <location filename="../planner.c" line="696"/> + <location filename="../planner.c" line="699"/> <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="1004"/> + <location filename="../planner.c" line="1007"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../profile.c" line="1064"/> + <location filename="../profile.c" line="1058"/> <source>@: %d:%02d D: %.1f%s </source> @@ -5283,63 +5337,63 @@ D: %.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1067"/> + <location filename="../profile.c" line="1061"/> <source>P: %d%s </source> <translation>P: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1071"/> + <location filename="../profile.c" line="1065"/> <source>T: %.1f%s </source> <translation>T: %.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1077"/> + <location filename="../profile.c" line="1071"/> <source>V: %.1f%s </source> <translation>V: %.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1080"/> + <location filename="../profile.c" line="1074"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/min </translation> </message> <message> - <location filename="../profile.c" line="1082"/> + <location filename="../profile.c" line="1076"/> <source>CNS: %u%% </source> <translation>CNS: %u%%</translation> </message> <message> - <location filename="../profile.c" line="1084"/> + <location filename="../profile.c" line="1078"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1086"/> + <location filename="../profile.c" line="1080"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1088"/> + <location filename="../profile.c" line="1082"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fbar</translation> </message> <message> - <location filename="../profile.c" line="1091"/> + <location filename="../profile.c" line="1085"/> <source>MOD: %d%s </source> <translation>MOD: %d%s</translation> </message> <message> - <location filename="../profile.c" line="1098"/> + <location filename="../profile.c" line="1092"/> <source>EAD: %d%s EADD: %d%s </source> @@ -5348,7 +5402,7 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1102"/> + <location filename="../profile.c" line="1096"/> <source>END: %d%s EADD: %d%s </source> @@ -5357,142 +5411,142 @@ EADD: %d%s </translation> </message> <message> - <location filename="../profile.c" line="1114"/> + <location filename="../profile.c" line="1108"/> <source>Safetystop: %umin @ %.0f%s </source> <translation>安全停留: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1117"/> + <location filename="../profile.c" line="1111"/> <source>Safetystop: unkn time @ %.0f%s </source> <translation>安全停留: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1122"/> + <location filename="../profile.c" line="1116"/> <source>Deco: %umin @ %.0f%s </source> <translation>Deco: %umin @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1125"/> + <location filename="../profile.c" line="1119"/> <source>Deco: unkn time @ %.0f%s </source> <translation>減壓: 未知時間 @ %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1129"/> + <location filename="../profile.c" line="1123"/> <source>In deco </source> <translation>減壓中 </translation> </message> <message> - <location filename="../profile.c" line="1131"/> + <location filename="../profile.c" line="1125"/> <source>NDL: %umin </source> <translation>NDL: %umin </translation> </message> <message> - <location filename="../profile.c" line="1134"/> + <location filename="../profile.c" line="1128"/> <source>TTS: %umin </source> <translation>TTS: %umin </translation> </message> <message> - <location filename="../profile.c" line="1137"/> + <location filename="../profile.c" line="1131"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>減壓: %umin @ %.0f%s (calc) </translation> </message> <message> - <location filename="../profile.c" line="1145"/> + <location filename="../profile.c" line="1139"/> <source>In deco (calc) </source> <translation>減壓 (計算) </translation> </message> <message> - <location filename="../profile.c" line="1147"/> + <location filename="../profile.c" line="1141"/> <source>NDL: %umin (calc) </source> <translation>NDL:%umin (預計) </translation> </message> <message> - <location filename="../profile.c" line="1150"/> + <location filename="../profile.c" line="1144"/> <source>TTS: %umin (calc) </source> <translation>TTS: %umin (calc) </translation> </message> <message> - <location filename="../profile.c" line="1153"/> + <location filename="../profile.c" line="1147"/> <source>Calculated ceiling %.0f%s </source> <translation>計算的上限深度 %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1159"/> + <location filename="../profile.c" line="1153"/> <source>Tissue %.0fmin: %.0f%s </source> <translation>組織 %.0fmin: %.0f%s </translation> </message> <message> - <location filename="../profile.c" line="1165"/> + <location filename="../profile.c" line="1159"/> <source>heartbeat: %d </source> <translation>心跳: %d </translation> </message> <message> - <location filename="../profile.c" line="1167"/> + <location filename="../profile.c" line="1161"/> <source>bearing: %d </source> <translation>方位: %d </translation> </message> <message> - <location filename="../profile.c" line="1260"/> + <location filename="../profile.c" line="1254"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../profile.c" line="1264"/> - <location filename="../profile.c" line="1268"/> - <location filename="../profile.c" line="1272"/> + <location filename="../profile.c" line="1258"/> + <location filename="../profile.c" line="1262"/> + <location filename="../profile.c" line="1266"/> <source>%s %sD:%.1f%s</source> <translation>%s %sD:%.1f%s</translation> </message> <message> - <location filename="../profile.c" line="1276"/> + <location filename="../profile.c" line="1270"/> <source>%s %sD:%.1f%s </source> <translation>%s %sD:%.1f%s </translation> </message> <message> - <location filename="../profile.c" line="1280"/> + <location filename="../profile.c" line="1274"/> <source>%s%sV:%.2f%s</source> <translation>%s%sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1284"/> - <location filename="../profile.c" line="1288"/> + <location filename="../profile.c" line="1278"/> + <location filename="../profile.c" line="1282"/> <source>%s %sV:%.2f%s</source> <translation>%s %sV:%.2f%s</translation> </message> <message> - <location filename="../profile.c" line="1295"/> + <location filename="../profile.c" line="1289"/> <source>%s %sP:%d %s</source> <translation>%s %sP:%d %s</translation> </message> @@ -5612,7 +5666,7 @@ EADD: %d%s <translation>減壓</translation> </message> <message> - <location filename="../dive.c" line="213"/> + <location filename="../dive.c" line="227"/> <source>ℓ</source> <translation>ℓ</translation> </message> @@ -5662,97 +5716,97 @@ EADD: %d%s <translation>(無潛水)</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sun</source> <translation>周日</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Mon</source> <translation>周一</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Tue</source> <translation>周二</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Wed</source> <translation>周三</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Thu</source> <translation>周四</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Fri</source> <translation>周五</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="81"/> + <location filename="../subsurfacestartup.c" line="83"/> <source>Sat</source> <translation>周六</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jan</source> <translation>1月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Feb</source> <translation>2月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Mar</source> <translation>3月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Apr</source> <translation>4月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>May</source> <translation>5月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="90"/> + <location filename="../subsurfacestartup.c" line="92"/> <source>Jun</source> <translation>6月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Jul</source> <translation>7月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Aug</source> <translation>8月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Sep</source> <translation>9月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Oct</source> <translation>10月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Nov</source> <translation>11月</translation> </message> <message> - <location filename="../subsurfacestartup.c" line="91"/> + <location filename="../subsurfacestartup.c" line="93"/> <source>Dec</source> <translation>12月</translation> </message> |