diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-11-12 08:12:36 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-11-12 08:12:36 -0800 |
| commit | 2aa97803b81accf9fa12f8716852679fb2843ad9 (patch) | |
| tree | dd4153c59ad2da3eb0bf4c3f8f66fd9bf09c889c /translations | |
| parent | f8c418c7895ad33ba018aaa866e1e0934fd04e75 (diff) | |
| download | subsurface-2aa97803b81accf9fa12f8716852679fb2843ad9.tar.gz | |
Latest strings and translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations')
29 files changed, 3246 insertions, 3338 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index f64dd2c18..002b0aeb2 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -3,22 +3,22 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation>Лице:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>Търсене за партньори и водачи</translation> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>Няма партньори</translation> </message> </context> <context> @@ -46,7 +46,7 @@ <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Настройките успешно рестартирани</translation> </message> </context> <context> @@ -404,11 +404,6 @@ <translation>Рестартирай настройки по подразбиране</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <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> @@ -417,12 +412,13 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>Suunto Vyper Family</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="618"/> @@ -660,28 +656,42 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> - <translation type="unfinished"/> + <translation>ppO₂ max</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> + <translation>ppO₂ min</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> <source>Total dive time</source> - <translation type="unfinished"/> + <translation>Време на гмуркане</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> - <translation>ppO2 макс</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> + <translation>кг/л</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> - <translation>ppO2 мин.</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> + <translation>Апнея</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -716,18 +726,6 @@ <translation>P0 (няма)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P1 (малко)</translation> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P2 (много)</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation>Честота</translation> @@ -809,11 +807,6 @@ <translation>Соленост</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation>кг/л</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation>ММ/ДД/ГГ</translation> @@ -834,11 +827,6 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation>Апнея</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> @@ -1799,8 +1787,8 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> - <translation type="unfinished"/> + <source>Save new</source> + <translation>Запиши нов</translation> </message> </context> <context> @@ -1901,7 +1889,7 @@ <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> <source>Get user ID</source> - <translation type="unfinished"/> + <translation>Вземи потребителски ID</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1923,19 +1911,6 @@ <source>Upload dive data</source> <translation>Качи данните за гмуркане</translation> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <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> @@ -2284,14 +2259,14 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> - <translation type="unfinished"/> + <translation>Ключ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Стойност</translation> </message> </context> <context> @@ -2304,7 +2279,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/listfilter.ui" line="22"/> <source>Text label</source> - <translation type="unfinished"/> + <translation>Текстов етикет</translation> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2341,7 +2316,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation>Местонахождение:</translation> </message> @@ -2349,9 +2324,9 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> - <translation type="unfinished"/> + <translation>Няма зададено местонахождение</translation> </message> </context> <context> @@ -2471,11 +2446,11 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/maintab.ui" line="958"/> <source>Extra data</source> - <translation type="unfinished"/> + <translation>Допълнителни данни</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -2982,12 +2957,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>&Filter by tags</source> - <translation type="unfinished"/> + <translation>Филтрирай по &тагове</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="855"/> <source>Toggle tissue graph</source> - <translation type="unfinished"/> + <translation>Превключи тъканна диаграма</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="843"/> @@ -3202,7 +3177,7 @@ p, li { white-space: pre-wrap; } <message> <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>Регистър файлове (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran файлове (*.can);;CSV файлове (*.csv);;DiveLog.de файлове (*.dld);;JDiveLog файлове (*.jlb);;Liquivision файлове (*.lvd);;MkVI файлове (*.txt);;Suunto файлове(*.sde *.db);;UDDF/UDCF файлове (*.uddf *.udcf);;XML файлове (*.xml);;Всички файлове(*)</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="767"/> @@ -3234,6 +3209,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3974,17 +3967,17 @@ p, li { white-space: pre-wrap; } <translation>Затвори</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Средно</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Максимум</translation> </message> @@ -4076,12 +4069,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Нов стартов номер</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Нов номер</translation> </message> @@ -4155,12 +4148,12 @@ p, li { white-space: pre-wrap; } <translation>Коя дата и час са показани на снимката?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Отвори изображения</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Изображения (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4302,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation>Тагове:</translation> </message> @@ -4310,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation>Празни тагове</translation> </message> @@ -4870,7 +4863,7 @@ Maximum</source> <translation>Максималният потдържан брой на CSV колони е %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>няма</translation> </message> @@ -4878,7 +4871,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>деко. стоп</translation> </message> @@ -4890,52 +4883,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>покачване</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>таван</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>натовареност</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>предавател</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>нарушение</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>бележка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>повърхност</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>безопасен стоп</translation> </message> @@ -4943,188 +4936,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>смяна на газ</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>безопасен стоп (свободен)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>безопасен стоп (задължителен)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>дълбочина на спиране</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>таван (безопасен стоп)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>време за гмуркане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>макс. дълбочина</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>време за въздух</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>посока</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>внимание: ниво на тъканта</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>нон стоп време</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>грешен номер на събитие</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <source>Unable to create parser for %s %s</source> <translation>Не може да бъде създаден разряд за %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Грешка при регистриране на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Грешка при разряд на дата и час</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Гмуркане №%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Грешка при рaзряд на време за гмуркане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Грешка при рaзряд на максимална дълбочина</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> - <translation type="unfinished"/> + <translation>Грешка при рaзряд на температура</translation> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Грешка при рaзряд на газ микс брой</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Грешка при прием на водна соленост</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Грешка при прием на повърхностно налягане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> - <translation type="unfinished"/> + <translation>Грешка при прием на режим на гмуркане</translation> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Грешка при рaзряд на газ микс</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Грешка при рaзряд на стойности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Събитие: изчаквание на действие от потребителя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Грешка при регистриране на направление за събития</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Грешка при регистриране на направление за отменяне</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Грешка при вход на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Не може да бъде създаден libdivecomputer контекст</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Не може да бъдe отворен %s %s (%s)</translation> </message> @@ -5284,7 +5277,7 @@ Maximum</source> <message> <location filename="../planner.c" line="652"/> <source>Gas consumption (CCR legs excluded):</source> - <translation type="unfinished"/> + <translation>Консумация на газ (CCR крака включени):</translation> </message> <message> <location filename="../planner.c" line="654"/> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index cc9ddcfde..5920104f9 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Saltindhold</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1798,7 +1786,7 @@ fjerne den valgte dykkercomputer?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1922,15 +1910,6 @@ fjerne den valgte dykkercomputer?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2279,12 +2258,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2336,7 +2315,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2344,7 +2323,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2469,8 +2448,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3229,6 +3208,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3969,17 +3966,17 @@ p, li { white-space: pre-wrap; } <translation>Luk</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maksimal</translation> </message> @@ -4071,12 +4068,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nyt start nummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Nyt nummer</translation> </message> @@ -4150,12 +4147,12 @@ p, li { white-space: pre-wrap; } <translation>Hvilke dato/tid er vist på billedet?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Åben billede til</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Billede filer (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4297,7 +4294,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4305,7 +4302,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4865,7 +4862,7 @@ Gennemsnit</translation> <translation>Maksimum antal kolonner i CSV import er %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>Ingen</translation> </message> @@ -4873,7 +4870,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>deco stop</translation> </message> @@ -4885,52 +4882,52 @@ Gennemsnit</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>Loft</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>Arbejdsbyrde</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>Sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>Overtrædelse</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>bogmærke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>overflade</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>sikkerhedsstop</translation> </message> @@ -4938,188 +4935,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>gasskifte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>Sikkerhedsstop (frivillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>Sikkerhedsstop (Krævet)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>dybe stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>Loft (sikkerhedsstop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Maks. dybde</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>Lufttid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>Overskrift</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>Vævs advarsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>non stop time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>Ugyldigt hændelses nummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Fejl i registrering af data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Fejl ved fortolkning af dato/tid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Dyk %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Fejl i fortolkning af dykkertid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Fejl i fortolkning af max dybde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Fejl i fortolkning af antallet af gasser</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Fejl i læsning af saltindhold i vandet</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Fejl ved at opnå overflade tryk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Fejl i fortolkning af gas blanding</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Fejl i fortolkning af prøver</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Fejl: registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Fejl: registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Import fejl i dykker data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Kan ikke danne libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Kan ikke åbne %s %s (%s)</translation> </message> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index d0ad9b2ff..422e3ed40 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Salzgehalt</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1796,7 +1784,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1920,15 +1908,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2277,12 +2256,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2334,7 +2313,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2342,7 +2321,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2467,8 +2446,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3227,6 +3206,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3967,17 +3964,17 @@ p, li { white-space: pre-wrap; } <translation>Schliessen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Max.</translation> </message> @@ -4069,12 +4066,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Neue erste Nummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Neue Nummer</translation> </message> @@ -4148,12 +4145,12 @@ p, li { white-space: pre-wrap; } <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Öffne Bilddatei</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4295,7 +4292,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4303,7 +4300,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4860,7 +4857,7 @@ Mittel</translation> <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>keine</translation> </message> @@ -4868,7 +4865,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>Deko-Stopp</translation> </message> @@ -4880,52 +4877,52 @@ Mittel</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>tiefster Deko-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>Arbeit</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>Sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>Verletzung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>Markierung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>Oberfläche</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>Sicherheitsstopp</translation> </message> @@ -4933,188 +4930,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>Gaswechsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>Sicherheitsstopp (freiwillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>Sicherheitsstopp (obligatorisch)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>Tiefen-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>Sicherheits-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>Tauchgangsdauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Max. Tiefe</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>verbleibende Atemzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>Richtung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>Gewebewarnung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>Nullzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>ungültige Ereignisnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Tauchgang %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen der Gasgemischs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 2277cef57..095cb28a7 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -3,22 +3,22 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>Sucht nach Tauchgruppenleiter und Tauchpartner</translation> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>Keine Tauchpartner</translation> </message> </context> <context> @@ -26,7 +26,7 @@ <message> <location filename="../configuredivecomputer.cpp" line="227"/> <source>Could not save the backup file %1. Error Message: %2</source> - <translation type="unfinished"/> + <translation>Sicherungsdatei %1 konnte nicht gespeichert werden. Fehlermeldung: %2</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="243"/> @@ -46,7 +46,7 @@ <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Geräte-Einstellungen erfolgreich zurückgesetzt</translation> </message> </context> <context> @@ -235,7 +235,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="796"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1963"/> <source>Last deco</source> - <translation type="unfinished"/> + <translation>Letzter Dekostopp</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="717"/> @@ -350,47 +350,47 @@ <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"/> @@ -404,25 +404,21 @@ <translation>Gerät auf die Standardeinstellungen zurücksetzen</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation>Erweiterte Einstellungen</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 type="unfinished"/> + <translation>Alternativer GF kann unter Wasser ausgewählt werden</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>Suunto Vyper Familie</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>Erweiterte Einstellungen</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> @@ -433,7 +429,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="625"/> <source>Pressure sensor offset</source> - <translation type="unfinished"/> + <translation>Drucksensor-Offset</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="632"/> @@ -451,7 +447,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="730"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1885"/> <source>Decotype</source> - <translation type="unfinished"/> + <translation>Dekotyp</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="756"/> @@ -473,19 +469,19 @@ <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"/> @@ -564,31 +560,31 @@ <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"/> @@ -633,7 +629,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1124"/> <source>O2 in calibration gas</source> - <translation type="unfinished"/> + <translation>O₂ im Kalibrations-Gas</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1148"/> @@ -656,32 +652,46 @@ <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>ppO₂ max</source> - <translation type="unfinished"/> + <translation>ppO₂ max</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> + <translation>ppO₂ min</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> <source>Total dive time</source> - <translation type="unfinished"/> + <translation>Gesamtdauer</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> - <translation type="unfinished"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> + <translation>kg/ℓ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> - <translation type="unfinished"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> + <translation>Apnoe</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -713,19 +723,7 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1424"/> <source>P0 (none)</source> <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> + <translation>P0 (keine)</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> @@ -809,11 +807,6 @@ <translation>Salzgehalt</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation>kg/l</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation>MM/TT/JJ</translation> @@ -834,29 +827,24 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation>Apnoe</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>Tauchcomputerdetails erfolgreich gelesen.</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="922"/> @@ -868,7 +856,8 @@ <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="929"/> <source>An error occurred while saving the backup file. %1</source> - <translation type="unfinished"/> + <translation>Beim Speichern der Datensicherungsdatei ist ein Fehler aufgetreten. +%1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="933"/> @@ -878,12 +867,12 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="934"/> <source>Your settings have been saved to: %1</source> - <translation type="unfinished"/> + <translation>Ihre Einstellungen wurden gespeichert nach: %1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="921"/> <source>Backup dive computer settings</source> - <translation type="unfinished"/> + <translation>Tauchcomputereinstellungen sichern</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="928"/> @@ -893,7 +882,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="946"/> <source>Restore dive computer settings</source> - <translation type="unfinished"/> + <translation>Tauchcomputereinstellungen wiederherstellen</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="951"/> @@ -904,7 +893,8 @@ <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="952"/> <source>An error occurred while restoring the backup file. %1</source> - <translation type="unfinished"/> + <translation>Beim Wiederherstellen der Datensicherungsdatei ist ein Fehler aufgetreten. +%1</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.cpp" line="959"/> @@ -995,7 +985,7 @@ <message> <location filename="../qt-ui/divecomponentselection.ui" line="40"/> <source>Which components would you like to copy</source> - <translation type="unfinished"/> + <translation>Welche Komponenten möchten Sie kopieren</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="46"/> @@ -1040,7 +1030,7 @@ <message> <location filename="../qt-ui/divecomponentselection.ui" line="102"/> <source>Tags</source> - <translation>Stichworte</translation> + <translation>Stichwörter</translation> </message> <message> <location filename="../qt-ui/divecomponentselection.ui" line="109"/> @@ -1388,7 +1378,7 @@ <message> <location filename="../qt-ui/divelogexportdialog.ui" line="244"/> <source>Export yearly statistics</source> - <translation type="unfinished"/> + <translation>Jährliche Statistiken exportieren</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.ui" line="270"/> @@ -1488,7 +1478,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>Tauchdaten an die dive-share.appspot.com-Webseite senden</translation> </message> <message> <location filename="../qt-ui/divelogexportdialog.cpp" line="84"/> @@ -1662,7 +1652,7 @@ <message> <location filename="../qt-ui/divelogimportdialog.ui" line="518"/> <source>Tags</source> - <translation>Stichworte</translation> + <translation>Stichwörter</translation> </message> <message> <location filename="../qt-ui/divelogimportdialog.ui" line="467"/> @@ -1796,8 +1786,8 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> - <translation type="unfinished"/> + <source>Save new</source> + <translation>Neue speichern</translation> </message> </context> <context> @@ -1898,7 +1888,7 @@ <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> <source>Get user ID</source> - <translation type="unfinished"/> + <translation>Benutzerkennung holen</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1920,15 +1910,6 @@ <source>Upload dive data</source> <translation>Tauchdaten hochladen</translation> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2277,14 +2258,14 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> - <translation type="unfinished"/> + <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Wert</translation> </message> </context> <context> @@ -2297,7 +2278,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/listfilter.ui" line="22"/> <source>Text label</source> - <translation type="unfinished"/> + <translation>Textbezeichnung</translation> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2334,7 +2315,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation>Ort:</translation> </message> @@ -2342,9 +2323,9 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> - <translation type="unfinished"/> + <translation>Kein Ort festgelegt</translation> </message> </context> <context> @@ -2373,7 +2354,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/maintab.ui" line="176"/> <source>Tags</source> - <translation>Stichworte</translation> + <translation>Stichwörter</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="223"/> @@ -2464,11 +2445,11 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/maintab.ui" line="958"/> <source>Extra data</source> - <translation type="unfinished"/> + <translation>Zusatzdaten</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -2865,7 +2846,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="449"/> <source>&Copy dive components</source> - <translation type="unfinished"/> + <translation>Tau&chkomponenten kopieren</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="452"/> @@ -2875,7 +2856,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="457"/> <source>&Paste dive components</source> - <translation type="unfinished"/> + <translation>Tauchkom&ponenten einfügen</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="460"/> @@ -2960,7 +2941,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="811"/> <source>Scale graph</source> - <translation type="unfinished"/> + <translation>Maßstabsgraph</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="823"/> @@ -2975,12 +2956,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>&Filter by tags</source> - <translation type="unfinished"/> + <translation>Nach Stichwörtern &filtern</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="855"/> <source>Toggle tissue graph</source> - <translation type="unfinished"/> + <translation>Gewebe-Sättigungskurve ein-/ausschalten</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="843"/> @@ -3195,7 +3176,7 @@ p, li { white-space: pre-wrap; } <message> <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>Tauchprotokolldateien (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran-Dateien (*.can);;CSV-Dateien (*.csv);;DiveLog.de-Dateien (*.dld);;JDiveLog-Dateien (*.jlb);;Liquivision-Dateien (*.lvd);;MkVI-Dateien (*.txt);;Suunto-Dateien (*.sde *.db);;UDDF/UDCF-Dateien (*.uddf *.udcf);;XML-Dateien (*.xml);;Alle Dateien (*)</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="767"/> @@ -3227,6 +3208,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3272,7 +3271,7 @@ p, li { white-space: pre-wrap; } <location filename="../qt-ui/diveplanner.cpp" line="490"/> <location filename="../qt-ui/diveplanner.cpp" line="491"/> <source>cuft/min</source> - <translation type="unfinished"/> + <translation>cuft/min</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="499"/> @@ -3818,7 +3817,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/models.cpp" line="2096"/> <source>Tags:</source> - <translation>Stichworte:</translation> + <translation>Stichwörter:</translation> </message> <message> <location filename="../qt-ui/models.cpp" line="2098"/> @@ -3967,17 +3966,17 @@ p, li { white-space: pre-wrap; } <translation>Schliessen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Max.</translation> </message> @@ -4069,12 +4068,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Neue erste Nummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Neue Nummer</translation> </message> @@ -4148,12 +4147,12 @@ p, li { white-space: pre-wrap; } <translation>Welche/s Datum/Zeit werden im Bild angezeigt?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Öffne Bilddatei</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilddateien (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4289,23 +4288,23 @@ 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> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> - <translation>Schlagwörter: </translation> + <translation>Stichwörter: </translation> </message> </context> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> - <translation>Leere Schlagwörter</translation> + <translation>Leere Stichwörter</translation> </message> </context> <context> @@ -4374,12 +4373,12 @@ p, li { white-space: pre-wrap; } <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>Die aktuellste Version ist %1, bitte den Betriebssystem Hersteller kontaktieren.</translation> </message> <message> <location filename="../qt-ui/updatemanager.cpp" line="75"/> <source>Newest release version is </source> - <translation type="unfinished"/> + <translation>Die letzte freigegebene Version ist</translation> </message> <message> <location filename="../qt-ui/updatemanager.cpp" line="76"/> @@ -4848,7 +4847,7 @@ Durchschnitt</translation> <message> <location filename="../file.c" line="550"/> <source>Poseidon import failed: unable to read '%s'</source> - <translation type="unfinished"/> + <translation>Poseidon-Import fehlgeschlagen: kann '%s' nicht lesen</translation> </message> <message> <location filename="../file.c" line="643"/> @@ -4863,7 +4862,7 @@ Durchschnitt</translation> <translation>maximale Anzahl der unterstützten Spalten beim CSV-Import sind %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>keine</translation> </message> @@ -4871,7 +4870,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>Deko-Stopp</translation> </message> @@ -4883,52 +4882,52 @@ Durchschnitt</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>tiefster Deko-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>Arbeit</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>Sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>Verletzung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>Markierung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>Oberfläche</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>Sicherheitsstopp</translation> </message> @@ -4936,188 +4935,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>Gaswechsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>Sicherheitsstopp (freiwillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>Sicherheitsstopp (obligatorisch)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>Tiefen-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>Sicherheits-Stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>Tauchgangsdauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Max. Tiefe</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>verbleibende Atemzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>Richtung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>Gewebewarnung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>Nullzeit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>ungültige Ereignisnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Fehler beim Registrieren der Daten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Fehler beim Lesen des Datums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Tauchgang %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Fehler beim Lesen der Dauer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Fehler beim Lesen der maximalen Tiefe</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> - <translation type="unfinished"/> + <translation>Fehler beim Lesen der Temperatur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Fehler beim Lesen der Gasgemischszahl</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Fehler beim Lesen des Salzgehalts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Kein Oberflächendruck erhalten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Fehler beim Lesen des Gasgemischs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> @@ -5295,7 +5294,7 @@ Durchschnitt</translation> <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>HAFTUNGSAUSSCHLUSS / WARNUNG: DIES IST EINE NEUE IMPLEMENTATION DES BÜHLMANN-ALGORITHMUS UND EINES DARAUF BASIERENDEN TAUCHPLANERS, DIE NUR EINGESCHRÄNKT GETESTET WURDE. WIR RATEN DRINGENST, KEINE TAUCHGÄNGE DURCHZUFÜHREN, DIE NUR AUF DEN HIER ERSTELLTEN DATEN BERUHEN.</translation> </message> <message> <location filename="../planner.c" line="675"/> @@ -6127,7 +6126,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../save-html.c" line="472"/> <source>Tags</source> - <translation>Stichworte</translation> + <translation>Stichwörter</translation> </message> <message> <location filename="../save-html.c" line="473"/> @@ -6232,7 +6231,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <message> <location filename="../save-html.c" line="486"/> <source>Average SAC</source> - <translation type="unfinished"/> + <translation>Durchschnittliches AMV</translation> </message> <message> <location filename="../save-html.c" line="487"/> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index 39f7f4127..30edd7382 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Αλμυρότητα</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3222,6 +3201,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3962,17 +3959,17 @@ p, li { white-space: pre-wrap; } <translation>Κλείσιμο</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Μέσος όρος</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Ελάχιστο</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Μέγιστο</translation> </message> @@ -4064,12 +4061,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Νέος αρχικός αριθμός</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4143,12 +4140,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4290,7 +4287,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4298,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4854,7 +4851,7 @@ SAC (%1)</translation> <translation>Μέγιστο αριθμός υποστηριζόμενων στηλών στην εισαγωγή CSV είναι %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>κανένα</translation> </message> @@ -4862,7 +4859,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>στάση αποσυμπίεσης</translation> </message> @@ -4874,52 +4871,52 @@ SAC (%1)</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>άνοδος</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>ταβάνι</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>φόρτο εργασίας</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>πομπός</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>παράβαση</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>σελιδοδείκτης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>επιφάνεια</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>στάση ασφαλείας</translation> </message> @@ -4927,188 +4924,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>αλλαγή αερίου</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>στάση ασφαλείας (προληπτική)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>στάση ασφαλείας (υποχρεωτική)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>βαθιά στάση</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>ταβάνι (στάση ασφαλείας)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>διάρκεια</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>μέγιστο βάθος</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>airtime</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>heading</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>προειδοποίηση επιπέδου ιστών</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>non stop time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>άκυρος αριθμός συμβάντος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <source>Unable to create parser for %s %s</source> <translation>Αδύνατον να αναλυθεί το %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Σφάλμα στην καταχώρηση των δεδομένων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Σφάλμα στην ημερομηνία</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Κατάδυση %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Σφάλμα στην διάρκεια της κατάδυσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Σφάλμα στο μέγιστο βάθος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Σφάλμα στον αριθμό των αερίων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Σφάλμα στην απόκτηση της αλμυρότητας</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Σφάλμα στην απόκτηση της ατμοσφαιρικής πίεσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Σφάλμα στο μίγμα αερίων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Σφάλμα στα δείγματα</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Συμβάν: Περιμένοντας για ενέργεια από τον χρήστη</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Σφάλμα στην καταχώρηση του συμβάντος</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Σφάλμα στην καταχώρηση της ακύρωσης</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Σφάλμα στην εισαγωγή δεδομένων</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Αδύνατον να ανοιχθεί το %s %s (%s)</translation> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index 98a5d2c3e..75ee03bbf 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -3,22 +3,22 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation>Person: </translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>Searches for buddies and divemasters</translation> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>No buddies</translation> </message> </context> <context> @@ -46,7 +46,7 @@ <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Device settings successfully reset</translation> </message> </context> <context> @@ -404,11 +404,6 @@ <translation>Reset device to default settings</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -417,12 +412,13 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>Suunto Vyper family</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>Advanced settings</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> @@ -660,28 +656,42 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> - <translation type="unfinished"/> + <translation>ppO₂ max</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> + <translation>ppO₂ min</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> <source>Total dive time</source> - <translation type="unfinished"/> + <translation>Total dive time</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> - <translation type="unfinished"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> + <translation>kg/ℓ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> - <translation type="unfinished"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> + <translation>Apnoea</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -716,18 +726,6 @@ <translation>P0 (none)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P1 (some)</translation> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P2 (much)</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation>Sample rate</translation> @@ -809,11 +807,6 @@ <translation>Salinity</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation>MM/DD/YY</translation> @@ -834,11 +827,6 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation>Apnoe</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> @@ -1799,8 +1787,8 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> - <translation type="unfinished"/> + <source>Save new</source> + <translation>Save new</translation> </message> </context> <context> @@ -1901,7 +1889,7 @@ <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> <source>Get user ID</source> - <translation type="unfinished"/> + <translation>Get user ID</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1923,15 +1911,6 @@ <source>Upload dive data</source> <translation>Upload dive data</translation> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2280,14 +2259,14 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> - <translation type="unfinished"/> + <translation>Key</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Value</translation> </message> </context> <context> @@ -2300,7 +2279,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/listfilter.ui" line="22"/> <source>Text label</source> - <translation type="unfinished"/> + <translation>Text label</translation> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2337,7 +2316,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation>Location: </translation> </message> @@ -2345,9 +2324,9 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> - <translation type="unfinished"/> + <translation>No location set</translation> </message> </context> <context> @@ -2467,11 +2446,11 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/maintab.ui" line="958"/> <source>Extra data</source> - <translation type="unfinished"/> + <translation>Extra data</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -2978,12 +2957,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>&Filter by tags</source> - <translation type="unfinished"/> + <translation>&Filter by tags</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="855"/> <source>Toggle tissue graph</source> - <translation type="unfinished"/> + <translation>Toggle tissue graph</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="843"/> @@ -3198,7 +3177,7 @@ p, li { white-space: pre-wrap; } <message> <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>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(*)</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="767"/> @@ -3230,6 +3209,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3970,17 +3967,17 @@ p, li { white-space: pre-wrap; } <translation>Close</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Average</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maximum</translation> </message> @@ -4072,12 +4069,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>New starting number</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>New number</translation> </message> @@ -4151,12 +4148,12 @@ p, li { white-space: pre-wrap; } <translation>Which date and time are displayed on the image?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Open image file</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4292,13 +4289,13 @@ 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> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation>Tags: </translation> </message> @@ -4306,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation>Empty Tags</translation> </message> @@ -4866,7 +4863,7 @@ Maximum</translation> <translation>Maximum number of supported columns on CSV import is %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>none</translation> </message> @@ -4874,64 +4871,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>deco stop</translation> </message> <message> <location filename="../cochran.c" line="338"/> <source>battery</source> - <translation type="unfinished"/> + <translation>battery</translation> </message> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>workload</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>transmitter</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>safety stop</translation> </message> @@ -4939,188 +4936,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>gas change</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>safety stop (recommended)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>safety stop (mandatory)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>deep stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>ceiling (safety stop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>divetime</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>maxdepth</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>airtime</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>heading</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>tissue level warning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>no-stop time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>invalid event number</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Error registering data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Error parsing the date/time</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Dive %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Error parsing the divetime</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Error parsing the maxdepth</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> - <translation type="unfinished"/> + <translation>Error parsing temperature</translation> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Error parsing the gas mix count</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Error obtaining water salinity</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Error obtaining surface pressure</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> - <translation type="unfinished"/> + <translation>Error obtaining divemode</translation> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Error parsing the gas mix</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Error parsing the samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Error registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Dive data import error</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Unable to create libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Unable to open %s %s (%s)</translation> </message> @@ -5280,7 +5277,7 @@ Maximum</translation> <message> <location filename="../planner.c" line="652"/> <source>Gas consumption (CCR legs excluded):</source> - <translation type="unfinished"/> + <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> <location filename="../planner.c" line="654"/> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index dab711d20..687b573a8 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation>Persona:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation>Resetear el dispositivo a los ajustes iniciales</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,28 +656,42 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> - <translation>ppO2 min</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -716,18 +726,6 @@ <translation>P0 (nada)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P1 (algo)</translation> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P2 (mucho)</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation>Frecuencia de muestreo</translation> @@ -809,11 +807,6 @@ <translation>Salinidad</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation>kg/l</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation>MM/DD/YY</translation> @@ -834,11 +827,6 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation>Apnea</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> @@ -1800,7 +1788,7 @@ el ordenador de buceo seleccionado?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1924,19 +1912,6 @@ el ordenador de buceo seleccionado?</translation> <source>Upload dive data</source> <translation>Subir datos de buceo</translation> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <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> @@ -2285,14 +2260,14 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Valor</translation> </message> </context> <context> @@ -2342,7 +2317,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation>Ubicación:</translation> </message> @@ -2350,7 +2325,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2475,8 +2450,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3235,6 +3210,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3975,17 +3968,17 @@ p, li { white-space: pre-wrap; } <translation>Cerrar</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Promedio</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Mínima</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Máxima</translation> </message> @@ -4077,12 +4070,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Número de partida nuevo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Nuevo número</translation> </message> @@ -4156,12 +4149,12 @@ p, li { white-space: pre-wrap; } <translation>¿ Que fecha y hora se muestran en la imagen ?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Abrir archivo de imagen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Archivos de imagen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4303,7 +4296,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation>Etiquetas:</translation> </message> @@ -4311,7 +4304,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation>Etiquetas vacio</translation> </message> @@ -4871,7 +4864,7 @@ Media</translation> <translation>El máximo número de columnas que soporta importar CSV es %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>ninguno</translation> </message> @@ -4879,7 +4872,7 @@ 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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>parada deco</translation> </message> @@ -4891,52 +4884,52 @@ Media</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>techo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>esfuerzo</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>transmisor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>violación</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>marcador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>parada de seguridad</translation> </message> @@ -4944,188 +4937,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>cambio de mezcla</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>parada de seguridad (voluntaria)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>parada de seguridad (obligatoria)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>parada de profundidad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>techo (parada de seguridad)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>duración de inmersión</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Profundidad Max</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>tiempo de aire</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>encabezado</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>Alarma de nivel de tejidos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>tiempo sin parada</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>el número de evento no es válido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Error al registrar los datos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Error al analizar la fecha</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Inmersión n.º %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Error al analizar el tiempo de buceo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Error al analizar la máxima profundidad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Error al obtener salinidad del agua</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Error al obtener la presión en superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Error al analizar la mezcla de gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Error al analizar las muestras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Evento: esperando acción del usuario</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Error al registrar el manejador de eventos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Error al registrar el manejador de cancelación</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Error al importar datos de inmersiones</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>No es posible crear el contexto de libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>No se pudo abrir %s %s (%s)</translation> </message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index c9e3b7308..b025eeba7 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Soolsus</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3227,6 +3206,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3968,17 +3965,17 @@ väärtused</translation> <translation>Sulge</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Keskmine</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Miinimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maksimum</translation> </message> @@ -4070,12 +4067,12 @@ väärtused</translation> </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Uus algusnumber</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Uus number</translation> </message> @@ -4149,12 +4146,12 @@ väärtused</translation> <translation>Mis kuupäev ja kellaaeg on pildil?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Ava pildifail</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pildifailid (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4296,7 +4293,7 @@ väärtused</translation> <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4304,7 +4301,7 @@ väärtused</translation> <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4864,7 +4861,7 @@ Max</translation> <translation>CSV impordil on max toetatud veergude arv %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>mitte ükski</translation> </message> @@ -4872,7 +4869,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>dekopeatus</translation> </message> @@ -4884,52 +4881,52 @@ Max</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>lagi</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>töökoormus</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>saatja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>rikkumine</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>järjehoidja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>pind</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>ohutuspeatus</translation> </message> @@ -4937,188 +4934,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>gaasivahetus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>ohutuspeatus (vabatahtlik)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>ohutuspeatus (kohustuslik)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>sügavpeatus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>lagi (ohutuspeatus)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>põhjaaeg</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>max sügavus</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>aeg õhuga</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>suund</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>koe taseme hoiatus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>mittepeatuste aeg</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>vale sündmuse nr</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Viga andmete registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Viga kuupäeva ja aja tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Sukeldumine %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Viga põhjaaja tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Viga max sügavuse tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Viga gaasisegude arvu tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Viga vee soolsuse saamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Viga pinnarõhu saamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Viga gaasisegu tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Viga proovide tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Sündmus: ootan kasutaja sekkumist</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Viga sündmuste draiveri registreerimisel.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Viga tühistamise draiveri registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Viga sukeldumise andmete impordil</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Ei saa luua libdivecomputer konteksti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Ei saa avada %s %s (%s)</translation> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index 8c53ef8fe..ad99de07b 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Suolapitoisuus</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ poistaa valitun sukellustietokoneen?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ poistaa valitun sukellustietokoneen?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3228,6 +3207,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3969,17 +3966,17 @@ p, li { white-space: pre-wrap; } <translation>Sulje</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Keskim.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Alin</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Korkein</translation> </message> @@ -4071,12 +4068,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Uusi aloitusnumero</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Uusi numero</translation> </message> @@ -4150,12 +4147,12 @@ p, li { white-space: pre-wrap; } <translation>Mikä päivä ja aika näkyy kuvassa?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Avaa kuvatiedosto</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Kuvatiedostot (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4297,7 +4294,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4305,7 +4302,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4864,7 +4861,7 @@ Keski</translation> <translation>Maksimimäärä sarakkeita CSV -tuonnissa on %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>ei mitään</translation> </message> @@ -4872,7 +4869,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>deko-pysähdys</translation> </message> @@ -4884,52 +4881,52 @@ Keski</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>katto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>työmäärä</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>lähetin</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>rike</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>kirjanmerkki</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>pinta</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>turvapysähdys</translation> </message> @@ -4937,188 +4934,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>Kaasun vaihto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>turvapysähdys (vapaaehtoinen)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>turvapysähdys (pakollinen)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>syväpysähdys</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>katto (turvapysähdys)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>sukellusaika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Suurin syvyys</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>Ilma-aika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>suunta</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>kudoskertymän varoitus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>keskeytyksetön aika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>tuntematon tapahtumanumero</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Virhe tiedon rekisteröinnissä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Virhe ajan jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Sukellus %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Virhe sukelluksen keston jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Virhe maksimisyvyyden jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Virhe veden suolapitoisuuden määrityksessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Virhe ilmanpaineen määrityksessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Virhe kaasuseoksen jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Virhe näytteiden tulkinnassa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Tapahtuma: odotetaan käyttäjän toimia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Virhe sukellusten jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Avaaminen epäonnistui: %s %s (%s)</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 86f6f89cf..a06e409d6 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation>Rétablir les paramètres par défaut sur l'ordinateur </translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation>Réglages Avancés</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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,28 +656,42 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> - <translation>ppO2 min</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation>Taux d’échantillonnage </translation> @@ -809,11 +807,6 @@ <translation>Salinité</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1799,7 +1787,7 @@ l'ordinateur de plongée sélectionné ?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1923,15 +1911,6 @@ l'ordinateur de plongée sélectionné ?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2280,14 +2259,14 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Valeur</translation> </message> </context> <context> @@ -2337,7 +2316,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2345,7 +2324,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2470,8 +2449,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3230,6 +3209,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3970,17 +3967,17 @@ p, li { white-space: pre-wrap; } <translation>Fermer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Moyenne</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maximum</translation> </message> @@ -4072,12 +4069,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nouveau numéro de départ</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Nouveau numéro</translation> </message> @@ -4151,12 +4148,12 @@ p, li { white-space: pre-wrap; } <translation>Quelle est l'heure et la date affiché par l'image?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Ouvrir un fichier image</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Fichiers image (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4298,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4306,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4867,7 +4864,7 @@ Moyenne</translation> <translation>Le nombre maximum de colonnes supporté pour les importations de fichiers CSV est %d.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>aucun</translation> </message> @@ -4875,7 +4872,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>Arrêt de décompression</translation> </message> @@ -4887,52 +4884,52 @@ Moyenne</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>plafond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>charge</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>transmetteur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>violation</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>signet</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>palier de sécurité</translation> </message> @@ -4940,188 +4937,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>Changement de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>palier de sécurité (volontaire)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>palier de sécurité (obligatoire)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>Arrêt profond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>plafond (palier de sécurité)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>Temps de plongée</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>profondeur max</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>temps d'air</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>entête</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>Avertissement de niveau « tissue »</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>temps sans arrêt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>numéro d'événement non valide</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Impossible d'enregistrer les données</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Impossible d'analyser l'heure</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Plongée n°%d - %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Impossible d'analyser le temps de plongée</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Impossible d'analyser la profondeux maximale</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Impossible d'obtenir la salinité de l'eau</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Erreur à l'obtention de la pression en surface</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Impossible d'analyser le mélange gazeux</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Impossible d'analyser des échantillons</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <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="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Impossible d'enregistrer le gestionnaire d'événement.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Impossible d'enregistrer le gestionnaire d'annulation.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Erreur à l'import des données de plongées</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Impossible d'ouvrir %s %s (%s)</translation> </message> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index f7ad53f7b..39e1b4354 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>מליחות</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1796,7 +1784,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1920,15 +1908,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2277,12 +2256,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2334,7 +2313,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2342,7 +2321,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2467,8 +2446,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3221,6 +3200,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3961,17 +3958,17 @@ p, li { white-space: pre-wrap; } <translation>סגור</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>ממוצע</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>מינימום</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>מקסימום</translation> </message> @@ -4063,12 +4060,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>מספר התחלתי חדש</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4142,12 +4139,12 @@ p, li { white-space: pre-wrap; } <translation>איזה תאריך ושעה מוצגים בתמונה?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4289,7 +4286,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4297,7 +4294,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4853,7 +4850,7 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>אין</translation> </message> @@ -4861,7 +4858,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>עצירה לדיקומפרסיה</translation> </message> @@ -4873,52 +4870,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>rbt</source> <translation>זמן נותר בעומק</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>עליה</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>תקרה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>עומס</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>משדר</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>חריגה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>סימניה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>שטח</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>עצירת בטיחות</translation> </message> @@ -4926,188 +4923,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>החלפת גז</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>עצירת בטיחות (יזומה)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>עצירת בטיחות (חובה)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>עצירה בעומק</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>תקרה (עצירת בטיחות)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>זמןצלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>עומק מקס'</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>זמן אויר</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>כותרת</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>אזהרת רמות רקמות</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>זמן ללא עצירה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>מס' ארוע שגוי</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <source>Unable to create parser for %s %s</source> <translation>לא מצליח להבין %s %s </translation> </message> <message> - <location filename="../libdivecomputer.c" line="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>שגיאה ברישום המידע</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>שגיאה בקריאת תאריך</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>שגיאה בקריאת זמן צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>שגיאה בקריאת עומק מקסימלי</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>שגיאה בקריאת תערובת גזים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>שגיאה בקבלת מליחות מים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>שגיאה בקבלת לחץ על פני המים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>שגיאה בקריאת תערובת הגזים</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>שגיאה בקריאת נקודות דגימה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>אירוע: מחכה לפעולה של המשתמש</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>שגיאה ברישום שגרת ניהול</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>שגיאת יבוא נתוני צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>לא ניתן לפתוח את %s %s (%s)</translation> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 14a8f2ce1..54dde7099 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1796,7 +1784,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1920,15 +1908,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2276,12 +2255,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2333,7 +2312,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2341,7 +2320,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2466,8 +2445,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3220,6 +3199,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3960,17 +3957,17 @@ p, li { white-space: pre-wrap; } <translation>Zatvori</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Max.</translation> </message> @@ -4062,12 +4059,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Novi početni broj</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4141,12 +4138,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4288,7 +4285,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4296,7 +4293,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4842,7 +4839,7 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>nijedan</translation> </message> @@ -4850,7 +4847,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>deko zastoj</translation> </message> @@ -4862,52 +4859,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>strop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>opterećenje</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>odašiljač</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>povreda</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>bookmark</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>površina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>sigurnosna stanka</translation> </message> @@ -4915,188 +4912,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>promjena plina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>sigurnosna stanka (opcionalna)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>sigurnosna stanka (obavezna)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>dubinska stanka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>strop (sigurnosni zastoj)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>trajanje urona</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Max dubina</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>preostalo trajanje zraka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>kurs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>upozorenje tkivo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>non stop vrijeme</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>neispravan broj događaja</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Greška pri registraciji podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Greška pri parsiranju datuma i vremena</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Greška pri parsiranju vremena urona</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Greška pri parsiranju maksimalne dubine</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Greška pri parsiranju broja mješavina</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Greška pri dohvaćanju saliniteta vode</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Greška pri parsiranju mješavine plinova</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index 2221691fd..6c2cd2d4e 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1796,7 +1784,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1920,15 +1908,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2276,12 +2255,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2333,7 +2312,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2341,7 +2320,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2466,8 +2445,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3220,6 +3199,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3960,17 +3957,17 @@ p, li { white-space: pre-wrap; } <translation>Bezárás</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Átlag</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maximum</translation> </message> @@ -4062,12 +4059,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Új kezdő szám</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4141,12 +4138,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4288,7 +4285,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4296,7 +4293,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4842,7 +4839,7 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation type="unfinished"/> </message> @@ -4850,7 +4847,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation type="unfinished"/> </message> @@ -4862,52 +4859,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation type="unfinished"/> </message> @@ -4915,188 +4912,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation type="unfinished"/> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Hiba az adat regisztrálása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Hiba a dátumidő feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Hiba a merülési idő feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Hiba a max mélység feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <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="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <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="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Hiba a minták feldolgozása alatt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <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="735"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="795"/> + <location filename="../libdivecomputer.c" line="774"/> <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="800"/> + <location filename="../libdivecomputer.c" line="779"/> <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="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Merülési adat importálási hiba</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 8f92c553c..987644c8d 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Kadar Garam</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1796,7 +1784,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1920,15 +1908,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2276,12 +2255,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2333,7 +2312,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2341,7 +2320,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2466,8 +2445,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3220,6 +3199,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3960,17 +3957,17 @@ p, li { white-space: pre-wrap; } <translation>Tutup</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Rata-rata</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimal</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maksimal</translation> </message> @@ -4062,12 +4059,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nomor Awal baru</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4141,12 +4138,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4288,7 +4285,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4296,7 +4293,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4850,7 +4847,7 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>kosong</translation> </message> @@ -4858,7 +4855,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>pemberhentian deco</translation> </message> @@ -4870,52 +4867,52 @@ Rata-rata</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>batas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>beban kerja</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>pemancar</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>gangguan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>tandai</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>permuakaan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation type="unfinished"/> </message> @@ -4923,188 +4920,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>ganti gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>safety stop (bebas)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>safety stop (wajib)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>batas (safety stop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>waktu selam</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>dalam maks</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>waktu mengudara</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>judul</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>peringatan tingkat jaringan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>waktu non stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>nomor kejadian tidak sesuai</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Gagal mendaftarkan data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Gagal mengurai tanggal</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Gagal mengurai waktu selam</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Gagal mengurai kedalamn maks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Gagal mengurai perhitungan campuran gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 2befb1259..5c9fb8c78 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -3,22 +3,22 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation>Persona:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>Ricerca compagni di immersione e Divemaster</translation> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>Nessun compagno di immersione</translation> </message> </context> <context> @@ -46,7 +46,7 @@ <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Impostazioni del dispositivo ripristinate correttamente</translation> </message> </context> <context> @@ -404,11 +404,6 @@ <translation>Reimposta il dispositivo alle impostazioni di fabbrica</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation>Impostazioni avanzate</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> @@ -417,12 +412,13 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>Famiglia Suunto Vyper</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>Impostazioni avanzate</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> @@ -660,28 +656,42 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> - <translation type="unfinished"/> + <translation>ppO₂ max</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> + <translation>ppO₂ min</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> <source>Total dive time</source> - <translation type="unfinished"/> + <translation>Tempo totale d'immersione</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> - <translation>ppO2 max</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> + <translation>kg/ℓ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> - <translation>ppO2 min</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> + <translation>Apnea</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -716,18 +726,6 @@ <translation>P0 (nessuno)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P1 (medio)</translation> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P2 (alto)</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation>Frequenza di campionamento</translation> @@ -809,11 +807,6 @@ <translation>Salinità</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation>kg/l</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation>MM/GG/AA</translation> @@ -834,11 +827,6 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation>Apnea</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> @@ -1799,8 +1787,8 @@ il computer selezionato?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> - <translation type="unfinished"/> + <source>Save new</source> + <translation>Salva nuovo</translation> </message> </context> <context> @@ -1901,7 +1889,7 @@ il computer selezionato?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> <source>Get user ID</source> - <translation type="unfinished"/> + <translation>Ottieni User ID</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1923,15 +1911,6 @@ il computer selezionato?</translation> <source>Upload dive data</source> <translation>Upload</translation> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2280,14 +2259,14 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> - <translation type="unfinished"/> + <translation>Chiave</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Valore</translation> </message> </context> <context> @@ -2300,7 +2279,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/listfilter.ui" line="22"/> <source>Text label</source> - <translation type="unfinished"/> + <translation>Etichetta di testo</translation> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2337,7 +2316,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation>Luogo:</translation> </message> @@ -2345,9 +2324,9 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> - <translation type="unfinished"/> + <translation>Nessun luogo impostato</translation> </message> </context> <context> @@ -2467,11 +2446,11 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/maintab.ui" line="958"/> <source>Extra data</source> - <translation type="unfinished"/> + <translation>Dati extra</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -2978,12 +2957,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>&Filter by tags</source> - <translation type="unfinished"/> + <translation>&Filtra per tag</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="855"/> <source>Toggle tissue graph</source> - <translation type="unfinished"/> + <translation>Attiva/disattiva il grafico dei tessuti</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="843"/> @@ -3198,7 +3177,7 @@ p, li { white-space: pre-wrap; } <message> <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>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(*)</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="767"/> @@ -3230,6 +3209,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3970,17 +3967,17 @@ p, li { white-space: pre-wrap; } <translation>Chiudi</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Media</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Massimo</translation> </message> @@ -4072,12 +4069,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nuovo numero di inizio</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Nuovo numero</translation> </message> @@ -4151,12 +4148,12 @@ p, li { white-space: pre-wrap; } <translation>Quale data ed orario sono mostrati nell'immagine?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Apri il file dell'immagine</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Files immagine (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4298,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation>Tag:</translation> </message> @@ -4306,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation>Etichette vuote</translation> </message> @@ -4866,7 +4863,7 @@ Media</translation> <translation>Il numero massimo di colonne supportate nel file CSV è di %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>nessuno</translation> </message> @@ -4874,7 +4871,7 @@ 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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>deco stop</translation> </message> @@ -4886,52 +4883,52 @@ Media</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>carico di lavoro</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>trasmettitore</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>violazione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>segnalibro</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>superficie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>sosta di sicurezza</translation> </message> @@ -4939,188 +4936,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>cambio gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>sosta di sicurezza (facoltativa)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>sosta di sicurezza (obbligatoria)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>ceiling (sosta di sicurezza)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>durata immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>profondità massima</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>tempo in aria</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>intestazione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>avviso del livello dei tessuti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>tempo di non stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>numero evento non valido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Errore registrando la data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Errore analizzando la data/il tempo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Immersione #%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Errore analizzando il tempo di immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Errore analizzando la profondità massima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> - <translation type="unfinished"/> + <translation>Errore analizzando la temperatura</translation> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Errore nell'ottenimento della salinità dell'acqua</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Errore nell'ottenere la pressione superficiale</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> - <translation type="unfinished"/> + <translation>Errore nell'ottenere la modalità di immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Errore analizzando la miscela di gas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Errore analizzando i campioni</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Evento: in attesa dell' azione dell'utente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Errore registrando il gestore degli eventi.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Errore registrando il gestore della cancellazione.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Errore importazione dati immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Impossibile creare un contesto libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Impossibile aprire %s %s (%s)</translation> </message> @@ -5282,7 +5279,7 @@ Media</translation> <message> <location filename="../planner.c" line="652"/> <source>Gas consumption (CCR legs excluded):</source> - <translation type="unfinished"/> + <translation>Consumo del gas (CCR legs escluse):</translation> </message> <message> <location filename="../planner.c" line="654"/> diff --git a/translations/subsurface_lv_LV.ts b/translations/subsurface_lv_LV.ts index 032419f99..b2c4547ea 100644 --- a/translations/subsurface_lv_LV.ts +++ b/translations/subsurface_lv_LV.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Sāļums</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ likvidēt izvēlētus datorus?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ likvidēt izvēlētus datorus?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3226,6 +3205,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3966,17 +3963,17 @@ p, li { white-space: pre-wrap; } <translation>Aizvērt</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Vidējais</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimums</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maksimums</translation> </message> @@ -4068,12 +4065,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Jauns sākuma skaitlis</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Jauns numurs</translation> </message> @@ -4147,12 +4144,12 @@ p, li { white-space: pre-wrap; } <translation>Kurš datums un laiks ir attēlots?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Atvērt attēla failu</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Attēlu faili (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4294,7 +4291,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4302,7 +4299,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4862,7 +4859,7 @@ Vidējais</translation> <translation>Maksimālais atbalstītais stabu skaits CSV importēšanai ir %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>neviens</translation> </message> @@ -4870,7 +4867,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>deko pietura</translation> </message> @@ -4882,52 +4879,52 @@ Vidējais</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>maksimāla dekompr. pietura</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>darba slodze</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>raidītājs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>pārkapšana</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>grāmatzīme</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>virsma</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>drošības pietura</translation> </message> @@ -4935,188 +4932,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>gāzes maiņa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>drošības pietura (brīvprātīga)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>drošības pietura (obligāta)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>dziļa pietura</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>maksimāla dekompr. pietura (drošības pietura)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>niršanas laiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>maks. dziļums</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>skābekļa laiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>virziens</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>audu līmeņa brīdinājums</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>bes apstāšanas laiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>kļūdains notikuma numurs</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Kļūda reģistrējot datus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Kļūda parsējot laiku</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Kļūda parsējot niršanas laiku</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Kļūda parsējot maks. dziļumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Kļūda ūdens sāļuma noteikšanā</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Kļūda spiediena noteikšanā uz virsmu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Kļūda parsējot gāzes maisījumu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Kļūda parsējot paraugus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Notikums: gaida lietotāja darbību</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <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="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Error registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Kļūda importējot niršanas datus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Nav iespējams izveidot libdivecomputer kontekstu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Nevar atvērt %s %s (%s)</translation> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 4de629717..379b900f9 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -3,22 +3,22 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> - <translation type="unfinished"/> + <translation>Person: </translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>Søk etter buddyer og dykkeledere</translation> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>Ingen buddyer</translation> </message> </context> <context> @@ -26,27 +26,27 @@ <message> <location filename="../configuredivecomputer.cpp" line="227"/> <source>Could not save the backup file %1. Error Message: %2</source> - <translation type="unfinished"/> + <translation>Kunne ikke lagre backupfila %1. Feilmelding: %2</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="243"/> <source>Could not open backup file: %1</source> - <translation type="unfinished"/> + <translation>Kunne ikke åpne backupfila: %1</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="567"/> <source>Setting successfully written to device</source> - <translation type="unfinished"/> + <translation>Lagret til computer</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="576"/> <source>Device firmware successfully updated</source> - <translation type="unfinished"/> + <translation>Firmware på computer er oppdatert</translation> </message> <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Innstillinger på computer er resatt</translation> </message> </context> <context> @@ -54,7 +54,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="14"/> <source>Configure dive computer</source> - <translation type="unfinished"/> + <translation>Konfigurer dykkecomputer</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>Hent tilgjengelige data</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="67"/> <source>Save changes to device</source> - <translation type="unfinished"/> + <translation>Lagre endringer til computer</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="93"/> <source>Backup</source> - <translation type="unfinished"/> + <translation>Sikkerhetskopi</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="100"/> <source>Restore backup</source> - <translation type="unfinished"/> + <translation>Hent sikkerhetskopi</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="110"/> <source>Update firmware</source> - <translation type="unfinished"/> + <translation>Oppdater firmware</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>Innstillinger</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>Serienr.</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>Firmware-versjon</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>Tekst</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>Engelsk</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="295"/> <source>German</source> - <translation type="unfinished"/> + <translation>Tysk</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="300"/> <source>French</source> - <translation type="unfinished"/> + <translation>Fransk</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="305"/> <source>Italian</source> - <translation type="unfinished"/> + <translation>Italiensk</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="313"/> <source>Dive mode</source> - <translation type="unfinished"/> + <translation>Dykkemodus</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>Gauge</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="339"/> <source>Apnea</source> - <translation type="unfinished"/> + <translation>Fridykking</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>Datoformat</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="358"/> <source>MMDDYY</source> - <translation type="unfinished"/> + <translation>MMDDÅÅ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="363"/> <source>DDMMYY</source> - <translation type="unfinished"/> + <translation>DDMMÅÅ</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="368"/> <source>YYMMDD</source> - <translation type="unfinished"/> + <translation>ÅÅMMDD</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>Metning</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="439"/> @@ -229,13 +229,13 @@ <location filename="../qt-ui/configuredivecomputerdialog.ui" line="678"/> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1833"/> <source>Desaturation</source> - <translation type="unfinished"/> + <translation>Avmetning</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>Siste deko</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="717"/> @@ -246,7 +246,7 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="376"/> <source>Brightness</source> - <translation type="unfinished"/> + <translation>Lysstyrke</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="387"/> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Saltholdighet</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1796,7 +1784,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1920,15 +1908,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2277,12 +2256,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2334,7 +2313,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2342,7 +2321,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2467,8 +2446,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3227,6 +3206,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3967,17 +3964,17 @@ p, li { white-space: pre-wrap; } <translation>Lukk</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Gjennomsnitt</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maksimum</translation> </message> @@ -4069,12 +4066,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nytt startnummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Nytt tall</translation> </message> @@ -4148,12 +4145,12 @@ p, li { white-space: pre-wrap; } <translation>Hvilket dato og tid vises på bildet?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Åpne bilder</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bilder (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4295,7 +4292,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4303,7 +4300,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4860,7 +4857,7 @@ Snitt</translation> <translation>Maks antall kolonner i CSV-importen er %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>ingen</translation> </message> @@ -4868,7 +4865,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>dekostopp</translation> </message> @@ -4880,52 +4877,52 @@ Snitt</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>tak</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>arbeidsbelastning</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>sender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>brudd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>bokmerke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>overflate</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>sikkerhetsstopp</translation> </message> @@ -4933,188 +4930,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>gassbytte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>sikkerhetsstopp (frivillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>sikkerhetsstopp (obligatorisk)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>dypstopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>tak (sikkerhetsstopp)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>maksdybde</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>pO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>lufttid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>retning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>Advarsel: nivå i vev</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>tid uten stopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>ugyldig hendelsesnummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Feil ved registrering av data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Feil ved lesing av dato</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Dykk %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Feil ved lesing av dykketid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Feil ved lesing av maksdybde</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Feil ved lesing av gassmiksantall</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Feil ved lesing av salthetsgrad</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Klarte ikke å hente overflatetrykk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Feil ved lesing av gassmiks</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index 79adfb766..c6ea67758 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -3,22 +3,22 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation>Persoon:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>zoekt naar buddies en divemasters</translation> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>Geen buddies</translation> </message> </context> <context> @@ -46,7 +46,7 @@ <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Instellingen van het toestel teruggesteld</translation> </message> </context> <context> @@ -404,11 +404,6 @@ <translation>Toestel instellen met standaardinstellingen </translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation>Geavanceerde Instellingen</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> @@ -417,12 +412,13 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>Suunto Vyper familie</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>Geavanceerde instellingen</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> @@ -660,28 +656,42 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> - <translation type="unfinished"/> + <translation>ppO₂ max</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> + <translation>ppO₂ min</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> <source>Total dive time</source> - <translation type="unfinished"/> + <translation>Totale duiktijd</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> - <translation>ppO2 max</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> + <translation>kg/ℓ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> - <translation>ppO2 min</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> + <translation>Apnee</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -716,18 +726,6 @@ <translation>P0 (geen)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P1 (een beetje)</translation> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P2 (veel)</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation>Bemonsteringsfrequentie</translation> @@ -809,11 +807,6 @@ <translation>Zoutgehalte</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation>kg/l</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation>MM/DD/JJ</translation> @@ -834,11 +827,6 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation>Apnee</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> @@ -1799,8 +1787,8 @@ duikcomputer wilt verwijderen?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> - <translation type="unfinished"/> + <source>Save new</source> + <translation>Bewaar als nieuw bestand</translation> </message> </context> <context> @@ -1901,7 +1889,7 @@ duikcomputer wilt verwijderen?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> <source>Get user ID</source> - <translation type="unfinished"/> + <translation>User ID Ophalen</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1923,19 +1911,6 @@ duikcomputer wilt verwijderen?</translation> <source>Upload dive data</source> <translation>Duikgegevens opladen</translation> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <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> @@ -2284,14 +2259,14 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> - <translation type="unfinished"/> + <translation>Sleutel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Waarde</translation> </message> </context> <context> @@ -2304,7 +2279,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/listfilter.ui" line="22"/> <source>Text label</source> - <translation type="unfinished"/> + <translation>Tekstlabel</translation> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2341,7 +2316,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation>Locatie:</translation> </message> @@ -2349,9 +2324,9 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> - <translation type="unfinished"/> + <translation>Locatie niet ingesteld</translation> </message> </context> <context> @@ -2471,11 +2446,11 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/maintab.ui" line="958"/> <source>Extra data</source> - <translation type="unfinished"/> + <translation>Extra gegevens</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -2982,12 +2957,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>&Filter by tags</source> - <translation type="unfinished"/> + <translation>Filter met trefwoorden</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="855"/> <source>Toggle tissue graph</source> - <translation type="unfinished"/> + <translation>Weefselgrafiek tonen/verbergen</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="843"/> @@ -3202,7 +3177,7 @@ p, li { white-space: pre-wrap; } <message> <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>Logboek bestanden (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;Cochran bestanden (*.can);;CSV bestanden (*.csv);;DiveLog.de bestanden (*.dld);;JDiveLog bestanden (*.jlb);;Liquivision bestanden (*.lvd);;MkVI bestanden (*.txt);;Suunto bestanden (*.sde *.db);;UDDF/UDCF bestanden (*.uddf *.udcf);;XML bestanden (*.xml);;Alle bestanden (*)</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="767"/> @@ -3234,6 +3209,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3974,17 +3967,17 @@ p, li { white-space: pre-wrap; } <translation>Sluiten</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Gemiddelde</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Kleinste</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Grootste</translation> </message> @@ -4076,12 +4069,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nieuw beginnummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Nieuw nummer</translation> </message> @@ -4155,12 +4148,12 @@ p, li { white-space: pre-wrap; } <translation>Welke datum en tijd worden weergegeven in de afbeelding?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Afbeelding openen</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Afbeeldingen (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4302,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation>Trefwoorden:</translation> </message> @@ -4310,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation>Lege trefwoorden</translation> </message> @@ -4870,7 +4863,7 @@ Maximum</translation> <translation>Het maximum aantal kolommen bij CSV importeren is %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>geen</translation> </message> @@ -4878,7 +4871,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>decompressiestop</translation> </message> @@ -4890,52 +4883,52 @@ Maximum</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>plafond</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>werklast</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>zender</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>schending</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>bladwijzer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>oppervlakte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>veiligheidsstop</translation> </message> @@ -4943,188 +4936,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>gaswissel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>veiligheidsstop (vrijwillig)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>veiligheidsstop (verplicht)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>diepe stop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>plafond (veiligheidsstop)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>duiktijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Max. diepte</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO₂</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>resterende luchttijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>RGBM</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>koers</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>waarschuwing stikstofbelasting</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>nultijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>ongeldig event-nummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Fout bij het registreren van de data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Fout bij verwerken van de datum en tijd</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Duik nr. %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Fout bij verwerken van de duikduur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Fout bij het verwerken van de maximum duikdiepte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> - <translation type="unfinished"/> + <translation>Fout bij het verwerken van de temperatuur</translation> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Fout bij het verkrijgen van het zoutgehalte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Fout bij bekomen van oppervlaktedruk</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> - <translation type="unfinished"/> + <translation>Fout bij bepalen duikmodus</translation> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Fout bij het verwerken van het gasmengsel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Fout bij het verwerken van de samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Event: wachten op handeling van gebruiker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Fout bij het registreren van de event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Fout bij het registreren van de cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Fout bij importeren van duikdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Kan geen context creëren voor libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Fout bij openen van %s %s (%s)</translation> </message> @@ -5284,7 +5277,7 @@ Maximum</translation> <message> <location filename="../planner.c" line="652"/> <source>Gas consumption (CCR legs excluded):</source> - <translation type="unfinished"/> + <translation>Gasverbruik (uitgezonderd CCR segmenten):</translation> </message> <message> <location filename="../planner.c" line="654"/> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index dfcfe38c7..350bf1bdf 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Zasolenie</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ wybrany komputer nurkowy?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ wybrany komputer nurkowy?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2469,8 +2448,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3229,6 +3208,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3969,17 +3966,17 @@ p, li { white-space: pre-wrap; } <translation>Zamknij</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>średnia</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>min.</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>max.</translation> </message> @@ -4071,12 +4068,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nowy numer początkowy</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Nowy numer</translation> </message> @@ -4150,12 +4147,12 @@ p, li { white-space: pre-wrap; } <translation>Jaka data i godzina jest na zdjęciu?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Otwórz zdjęcie</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Pliki graficzne (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4297,7 +4294,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4305,7 +4302,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4860,7 +4857,7 @@ Maximum</source> <translation>Maksymalna ilość kolumn danych przy imporcie CSV to %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>brak</translation> </message> @@ -4868,7 +4865,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>przystanek deco</translation> </message> @@ -4880,52 +4877,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>sufit</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>wysiłek</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>nadajnik</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>naruszenie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>notatka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>powierzchnia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>przystanek bezpieczeństwa</translation> </message> @@ -4933,188 +4930,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>zmiana gazu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>przystanek bezpieczeństwa (opcjonalny)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>przystanek bezpieczeństwa (obowiązkowy)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>sufit (przystanek bezpieczeństwa)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>czas nurkowania</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Max głębokość</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>Pozostały czas oddychania</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>kierunek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>Ostrzeżenie: poziom nasycenia tkanek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>czas bezdekompresyjny</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>niepoprawny znacznik</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Błąd podczas przetwarzania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Błąd podczas przetwarzania daty i czasu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Nurkowanie %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Błąd podczas przetwarzania czasu nurkowania</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Błąd podczas przetwarzania głębokości</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Błąd podczas przetwarzania danych o zasoleniu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Błąd podczas przetwarzania danych o cienieniu atmosferycznym</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <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="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Błąd podczas przetwarzania próbek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Oczekiwanie na działanie użytkownika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Błąd rejestracji uchwytu (event handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Błąd rejestracji uchwytu (cancellation handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Błąd podczas importowania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Nie można utworzyć kontekstu libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Nie udało się otworzyć %s %s (%s)</translation> </message> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index db69cbded..84bcb5368 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Salinidade</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ o computador de mergulho selecionado?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ o computador de mergulho selecionado?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3228,6 +3207,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3968,17 +3965,17 @@ p, li { white-space: pre-wrap; } <translation>Fechar</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Média</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Mínimo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Máximo</translation> </message> @@ -4070,12 +4067,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Novo número inicial</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Novo numero</translation> </message> @@ -4149,12 +4146,12 @@ p, li { white-space: pre-wrap; } <translation>Qual dia e hora são mostrados na imagem?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Imagens (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4296,7 +4293,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4304,7 +4301,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4863,7 +4860,7 @@ Médio</translation> <translation>O número máximo de colunas suportadas ao importar arquivos CSV é %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>nenhum</translation> </message> @@ -4871,7 +4868,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>parada de deco</translation> </message> @@ -4883,52 +4880,52 @@ Médio</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>teto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>nível de esforço</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>transmissor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>violação</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>favorito</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>superfície</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>parada de segurança</translation> </message> @@ -4936,188 +4933,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>troca de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>parada de segurança (voluntária)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>parada de segurança (obrigatória)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>parada profunda</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>teto (parada de segurança)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>duração do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>prof máx</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>tempo de ar</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>direção</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>Alarme do nível nos tecidos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>tempo sem parada</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>número de evento inválido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Erro no registo dos dados</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/horário</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Mergulho nº %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Erro na análise da duração do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <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="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <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="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Evento: aguardando ação do usuário</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Erro no registo do rótulo do evento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do rótulo de cancelamento.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Erro ao importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto da libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 406c7aeb4..88747edd1 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -3,22 +3,22 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation>Pessoa:</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> - <translation type="unfinished"/> + <translation>Busca por companheiros e guias de mergulho</translation> </message> </context> <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> - <translation type="unfinished"/> + <translation>Sem companheiros</translation> </message> </context> <context> @@ -46,7 +46,7 @@ <message> <location filename="../configuredivecomputer.cpp" line="585"/> <source>Device settings successfully reset</source> - <translation type="unfinished"/> + <translation>Configurações do dispositivo reconfiguradas com sucesso</translation> </message> </context> <context> @@ -404,11 +404,6 @@ <translation>Reinicializar dispositivo para as configurações padrão</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation>Configurações avançadas</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> @@ -417,12 +412,13 @@ <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="180"/> <source>Suunto Vyper family</source> - <translation type="unfinished"/> + <translation>Família Suunto Vyper</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>Configurações avançadas</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="618"/> @@ -660,28 +656,42 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> - <translation type="unfinished"/> + <translation>ppO₂ máxima</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> + <translation>ppO₂ mínima</translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> <source>Total dive time</source> - <translation type="unfinished"/> + <translation>Tempo total de mergulho</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> - <translation>ppO2 max</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> + <translation>kg/ℓ</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> - <translation>ppO2 min</translation> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> + <translation>Apneia</translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1264"/> @@ -716,18 +726,6 @@ <translation>P0 (nenhum)</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P1 (algum)</translation> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation>P2 (muito)</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation>Taxa de amostragem</translation> @@ -809,11 +807,6 @@ <translation>Salinidade</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation>kg/l</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation>MM/DD/AA</translation> @@ -834,11 +827,6 @@ <translation>ZH-L16 CC</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation>Apneia</translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation>L16-GF OC</translation> @@ -1799,8 +1787,8 @@ remover o computador de mergulho seleccionado?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> - <translation type="unfinished"/> + <source>Save new</source> + <translation>Gravar novo</translation> </message> </context> <context> @@ -1901,7 +1889,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="58"/> <source>Get user ID</source> - <translation type="unfinished"/> + <translation>Obter ID do utilizador</translation> </message> <message> <location filename="../qt-ui/diveshareexportdialog.ui" line="67"/> @@ -1923,19 +1911,6 @@ remover o computador de mergulho seleccionado?</translation> <source>Upload dive data</source> <translation>Carregar dados dos mergulhos</translation> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <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> @@ -2284,14 +2259,14 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> - <translation type="unfinished"/> + <translation>Chave</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Valor</translation> </message> </context> <context> @@ -2304,7 +2279,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/listfilter.ui" line="22"/> <source>Text label</source> - <translation type="unfinished"/> + <translation>Etiqueta de texto</translation> </message> <message> <location filename="../qt-ui/listfilter.ui" line="32"/> @@ -2341,7 +2316,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation>Local:</translation> </message> @@ -2349,9 +2324,9 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> - <translation type="unfinished"/> + <translation>Não foi definido um local</translation> </message> </context> <context> @@ -2471,11 +2446,11 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/maintab.ui" line="958"/> <source>Extra data</source> - <translation type="unfinished"/> + <translation>Dados extra</translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -2982,12 +2957,12 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-ui/mainwindow.ui" line="840"/> <source>&Filter by tags</source> - <translation type="unfinished"/> + <translation>&Filtrar por etiquetas</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="855"/> <source>Toggle tissue graph</source> - <translation type="unfinished"/> + <translation>Mostrar/ocultar gráfico dos tecidos</translation> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="843"/> @@ -3202,7 +3177,7 @@ p, li { white-space: pre-wrap; } <message> <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>Ficheiros de logbooks (*.can *.csv *.db *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml);;ficheiros Cochran (*.can);;CSV files (*.csv);;ficheiros DiveLog.de (*.dld);;ficheiros JDiveLog (*.jlb);;ficheiros Liquivision (*.lvd);;ficheiros MkVI (*.txt);;ficheiros Suunto (*.sde *.db);;ficheiros UDDF/UDCF (*.uddf *.udcf);;ficheiros XML (*.xml);;todos os Ficheiros(*)</translation> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="767"/> @@ -3234,6 +3209,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3974,17 +3967,17 @@ p, li { white-space: pre-wrap; } <translation>Encerrar</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Média</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Mínima</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Máxima</translation> </message> @@ -4076,12 +4069,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Novo número inicial</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Novo número</translation> </message> @@ -4155,12 +4148,12 @@ p, li { white-space: pre-wrap; } <translation>Que data e hora estão representados na imagem?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Abrir imagem</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Ficheiros de imagem (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4302,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation>Etiquetas:</translation> </message> @@ -4310,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation>Etiquetas vazias</translation> </message> @@ -4870,7 +4863,7 @@ Média</translation> <translation>O número máximo de colunas suportadas ao importar ficheiros CSV é %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>nenhum</translation> </message> @@ -4878,7 +4871,7 @@ 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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>paragem de deco</translation> </message> @@ -4890,52 +4883,52 @@ Média</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>tecto</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>esforço</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>transmissor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>transgressão</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>marcador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>superfície</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>paragem de segurança</translation> </message> @@ -4943,188 +4936,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>troca de gás</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>paragem de segurança (voluntária)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>paragem de segurança (obrigatória)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>paragem funda</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>tecto (paragem de segurança)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>Tempo de mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Profundidade máxima</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>autonomia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>cabeçalho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>Alarme de tensão de azoto nos tecidos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>tempo sem paragem</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>Número de evento inválido</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Erro no registo de dados</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Erro na análise da data/tempo</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Mergulho nº %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Erro na análise do tempo de mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Erro na análise da profundidade máxima</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> - <translation type="unfinished"/> + <translation>Erro ao analisar tempetaturas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Erro na obtenção da salinidade da água</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Erro na obtenção da pressão atmosférica</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> - <translation type="unfinished"/> + <translation>Erro na obtenção do modo de mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <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="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Evento: à espera de acção do utilizador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Erro no registo do "event handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do "cancellation handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Erro a importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto do libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> @@ -5285,7 +5278,7 @@ Média</translation> <message> <location filename="../planner.c" line="652"/> <source>Gas consumption (CCR legs excluded):</source> - <translation type="unfinished"/> + <translation>Consumo de gás (excluídas as fases c/CCR):</translation> </message> <message> <location filename="../planner.c" line="654"/> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index c025fa84a..15bf75233 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Salinitate</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ computerul de scufundări selectat?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ computerul de scufundări selectat?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3222,6 +3201,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3962,17 +3959,17 @@ p, li { white-space: pre-wrap; } <translation>Închide</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Medie</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minim</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maxim</translation> </message> @@ -4064,12 +4061,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nou număr de început</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4143,12 +4140,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"/> </message> @@ -4290,7 +4287,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4298,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4854,7 +4851,7 @@ Medie</translation> <translation>Numărul maxim de coloane suportate la importarea CSV-ului este %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>niciunul</translation> </message> @@ -4862,7 +4859,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>oprire de decompresie</translation> </message> @@ -4874,52 +4871,52 @@ Medie</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>plafon</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>volum de muncă</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>transmițător</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>încălcare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>semn de carte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>suprafață</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>oprire pentru siguranță</translation> </message> @@ -4927,188 +4924,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>schimbarea gazului</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>oprire pentru siguranță (voluntară)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>oprire pentru siguranță (obligatorie)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>plafon (oprire pentru siguranță)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>timp scufundare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>adâncime maximă</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>timp aer rămas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>direcție</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>avertizare nivel țesut</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>timp fără oprire</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>numărul evenimentul este invalid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Eroare înregistrând datele</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Eroare parsând data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Scufundarea %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Eroare parsând data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Eroare parsând adâncimea maximă</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Eroare parsând valoarea amestecului de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Eroare obținând salinitatea apei</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Eroare obținând presiunea la suprafață</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Eroare parsând amestecul de gaz</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Eroare parsând eșantioanele</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Eveniment: aștept acțiunea utilizatorului</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Eroare la înregistrarea handlerului de evenimente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Eroare la înregistrarea handlerului de anulare.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Eroare la importarea datelor despre scufundare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Nu s-a putut crea contextul libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Nu s-a putut deschide %s %s (%s)</translation> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 321113d62..d708add95 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Соленость</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3228,6 +3207,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3968,17 +3965,17 @@ p, li { white-space: pre-wrap; } <translation>Закрыть</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Среднее</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Минимум</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Максимум</translation> </message> @@ -4070,12 +4067,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Начать нумерацию с</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Новый номер</translation> </message> @@ -4149,12 +4146,12 @@ p, li { white-space: pre-wrap; } <translation>Какое время и дата отображены на изображении?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Открыть файл с изображением</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4296,7 +4293,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4304,7 +4301,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4864,7 +4861,7 @@ Maximum</source> <translation>Для импорта CSV максимально допустимое кол-во колонок %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>отсутствует</translation> </message> @@ -4872,7 +4869,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>деко стоп</translation> </message> @@ -4884,52 +4881,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>rbt</source> <translation>оставшееся время на дне</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>подъем</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>потолок</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>нагрузка</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>передатчик</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>нарушение</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>закладка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>поверхность</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>остановка безопасности</translation> </message> @@ -4937,188 +4934,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>замена смеси</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>остановка безопасности (добровольно)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>остановка безопасности (обязательно)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>глубокая остановка</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>потолок (остановка безопасности)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>время погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>макс. глуб.</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>оставшееся время по воздуху</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>направление</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>насыщение тканей</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>время без остановки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>неверный номер события</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Ошибка разбора даты/времени</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Погр. №%d - %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Ошибка разбора времени погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Ошибка разбора макс. глубины</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Ошибка разбора счетчика смесей</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Ошибка получения солености воды</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Ошибка получения давления на поверхности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index 72c48f6b9..0aa997887 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Slanosť</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1799,7 +1787,7 @@ vybraný počítač?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1923,15 +1911,6 @@ vybraný počítač?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2280,14 +2259,14 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> - <translation type="unfinished"/> + <translation>Hodnota</translation> </message> </context> <context> @@ -2337,7 +2316,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2345,7 +2324,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2470,8 +2449,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3230,6 +3209,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3970,17 +3967,17 @@ p, li { white-space: pre-wrap; } <translation>Zatvoriť</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Priemer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maximum</translation> </message> @@ -4072,12 +4069,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nové začiatočné číslo</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Nové číslo</translation> </message> @@ -4151,12 +4148,12 @@ p, li { white-space: pre-wrap; } <translation>Aký dátum a čas je zobrazený na fotke?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Otvoriť súbory s obrázkami</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Grafické súbory (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4298,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4306,7 +4303,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4862,7 +4859,7 @@ Maximum</translation> <translation>Maximálny počet podporovaných stĺpcov pre CSV import je %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>žiaden</translation> </message> @@ -4870,7 +4867,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>dekompresná zastávka</translation> </message> @@ -4882,52 +4879,52 @@ Maximum</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>strop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>záťaž</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>vysielač</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>prekročenie</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>poznámka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>povrch</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>bezpečnostná zastávka</translation> </message> @@ -4935,188 +4932,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>zmena plynu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>bezpečnostná zastávka (dobrovoľná)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>bezpečnostná zastávka (povinná)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>hĺbková zastávka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>strop (bezpečnostná zastávka)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>čas ponoru</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>max. hĺbka</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>čas na vzduchu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>smer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>upozornenie nasýtenia tkanív</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>non stop čas</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>neplatné číslo udalosti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Chyba registrácie dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Chyba spracovania času</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Ponor #%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Chyba spracovania času ponoru</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Chyba spracovania maximálnej hĺbky</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Chyba spracovania dýchacích zmesí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Chyba získania slanosti vody</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Chyba pri zisťovaní tlaku na povrchu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Chyba spracovania zmesi plynu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Chyba spracovania vzoriek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Udalosť: Čakanie na vstup uživateľa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Chyba registrácia správcu udalosti.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrácie správcu ukončenia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Chyba importu dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Problém inicializácie libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Nie je možné otvoriť %s %s (%s)</translation> </message> diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index ac573f242..3c6440de4 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -5,12 +5,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"></translation> </message> @@ -18,7 +18,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"></translation> </message> @@ -406,11 +406,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"></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> @@ -423,6 +418,7 @@ </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> </message> @@ -662,32 +658,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> - <source>Total dive time</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoea</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> - <source>ppO2 max</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1473"/> + <source>Total dive time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"></translation> </message> <message> @@ -723,18 +728,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"></translation> @@ -816,11 +809,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"></translation> @@ -1798,7 +1786,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"></translation> </message> </context> @@ -2269,12 +2257,12 @@ <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"></translation> </message> @@ -2326,7 +2314,7 @@ <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"></translation> </message> @@ -2334,7 +2322,7 @@ <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"></translation> </message> @@ -2459,8 +2447,8 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"></translation> </message> <message> @@ -3213,6 +3201,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3953,17 +3959,17 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation type="unfinished"></translation> </message> @@ -4055,12 +4061,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation type="unfinished"></translation> </message> @@ -4134,12 +4140,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation type="unfinished"></translation> </message> @@ -4281,7 +4287,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"></translation> </message> @@ -4289,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"></translation> </message> @@ -4835,7 +4841,7 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation type="unfinished"></translation> </message> @@ -4843,7 +4849,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation type="unfinished"></translation> </message> @@ -4855,52 +4861,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation type="unfinished"></translation> </message> @@ -4908,188 +4914,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation type="unfinished"></translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"></translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index ae100884b..1e55ed4ff 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Salthalt</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ radera den valda dykdatorn?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ radera den valda dykdatorn?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3228,6 +3207,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3968,17 +3965,17 @@ p, li { white-space: pre-wrap; } <translation>Stäng</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Genomsnitt</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Minimum</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Maximum</translation> </message> @@ -4070,12 +4067,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Nytt startnummer</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Nytt nummer</translation> </message> @@ -4149,12 +4146,12 @@ p, li { white-space: pre-wrap; } <translation>Vilket datum och tid visas på bilden?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Öppna bildfler</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Bildfiler (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4296,7 +4293,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4304,7 +4301,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4858,7 +4855,7 @@ Medel</translation> <translation>Maximalt antalet kolumner i CSV import är %d</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>inget</translation> </message> @@ -4866,7 +4863,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>dekostopp</translation> </message> @@ -4878,52 +4875,52 @@ Medel</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>ceiling</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>arbetsbelastning</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>sändare</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>kränkning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>bokmärke</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>ytan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>säkerhetsstopp</translation> </message> @@ -4931,188 +4928,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>gasbyte</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>säkerhetsstopp (frivilligt)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>säkerhetsstopp (obligatoriskt)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>djupstopp</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>ceiling (säkerhetsstopp)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>dyktid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>Maxdjup</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>gastid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>riktning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>vävnadsnivå</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>non stop tid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>okänt händelsenummer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Kunde inte registrera parser-data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Kunde inte tolka tid och datum</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>Dyk #%d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Kunde inte tolka dyktid</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Kunde inte tolka maxdjup</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>Kunde inte tolka antal gasblandningar</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Kunde inte ladda vattnets salthalt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Kunde inte få tag i tyck vid ytan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Kunde inte tolka gasblandning</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Kunde inte tolka sampel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Händelse: väntar på användaren</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Kunde inte registrera event-funktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>Kunde inte registrera avbrytningsrutin</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Lyckades inte importera dykdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>Kan inte skapa libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Kunde inte öppna fil %s %s (%s)</translation> </message> diff --git a/translations/subsurface_tr.ts b/translations/subsurface_tr.ts index 5192c58f1..e2274eaf8 100644 --- a/translations/subsurface_tr.ts +++ b/translations/subsurface_tr.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>Tuzluluk</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ kaldırmak istediğinizden emin misiniz?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ kaldırmak istediğinizden emin misiniz?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3222,6 +3201,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3962,17 +3959,17 @@ p, li { white-space: pre-wrap; } <translation>Kapat</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Ortalama</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Asgari</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Azami</translation> </message> @@ -4064,12 +4061,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Yeni başlama numarası</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>Yeni numara</translation> </message> @@ -4143,12 +4140,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>Görüntü dosyası aç</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Görüntü dosyaları (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4290,7 +4287,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4298,7 +4295,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4856,7 +4853,7 @@ Ortalama</translation> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>hiçbiri</translation> </message> @@ -4864,7 +4861,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation type="unfinished"/> </message> @@ -4876,52 +4873,52 @@ Ortalama</translation> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>tavan</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>iş yükü</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>yerimi</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>yüzey</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>güvenlik durağı</translation> </message> @@ -4929,188 +4926,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>gazdeğişimi</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>güvenlik durağı (gönüllü)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>güvenlik durağı (zorunlu)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>Tavan (güvenlik durağı)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>dalış zamanı</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>azamiderinlik</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>igbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>doku seviye uyarısı</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>geçersiz olay numarası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <source>Unable to create parser for %s %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Veri kaydedilirken hata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>Tarih saat ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>Dalış zamanı ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>Azami derinlik ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>Su tuzluluğu edinme hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>Yüzey basıncı edinme hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>Gaz karışımı ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>Örnekleri ayrıştırma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>Olay: kullanıcı eylemi bekleniyor</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>Olay işleyicisi kayıt hatası.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>Dalış verisi içe aktarma hatası</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index a7a9f92cc..970521f68 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ bỏ các máy lặn đã được chọn?</translation> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ bỏ các máy lặn đã được chọn?</translation> <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2277,12 +2256,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2334,7 +2313,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2342,7 +2321,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2467,8 +2446,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3221,6 +3200,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3961,17 +3958,17 @@ p, li { white-space: pre-wrap; } <translation>Đóng lại</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>Trung bình</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>Nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>Tối đa</translation> </message> @@ -4063,12 +4060,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>Số bắt đầu mới</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation type="unfinished"/> </message> @@ -4142,12 +4139,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>Tập tin hình ảnh (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4289,7 +4286,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4297,7 +4294,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4843,7 +4840,7 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>không</translation> </message> @@ -4851,7 +4848,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>dừng lại deco</translation> </message> @@ -4863,52 +4860,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>trần</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>tải công việc</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>máy phát radio</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>độ xâm phạm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>đánh dấu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>bề mặt</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>dừng an toàn</translation> </message> @@ -4916,188 +4913,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>thay đổi dưỡng khí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>dừng an toàn (tự nguyện)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>dừng an toàn (bắt buộc)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>deepstop</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>trần (độ an toàn)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>thời gian lặn</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>độ sâu tối đa</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>thời gian không khí</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>thẳng tiến</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>cảnh báo cấp độ mô</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>không dừng lại thời gian</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>chỉ số sự kiện không hợp lệ</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <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="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>Lỗi khi đăng ký dữ liệu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <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="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <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="485"/> + <location filename="../libdivecomputer.c" line="464"/> <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="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <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="534"/> + <location filename="../libdivecomputer.c" line="513"/> <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="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <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="590"/> + <location filename="../libdivecomputer.c" line="569"/> <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="727"/> + <location filename="../libdivecomputer.c" line="706"/> <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="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <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="800"/> + <location filename="../libdivecomputer.c" line="779"/> <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="821"/> + <location filename="../libdivecomputer.c" line="800"/> <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="860"/> + <location filename="../libdivecomputer.c" line="839"/> <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="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index c15cc8786..1ee07f2a6 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -3,12 +3,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="487"/> + <location filename="../qt-ui/simplewidgets.cpp" line="489"/> <source>Person: </source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="488"/> + <location filename="../qt-ui/simplewidgets.cpp" line="490"/> <source>Searches for buddies and divemasters</source> <translation type="unfinished"/> </message> @@ -16,7 +16,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2446"/> + <location filename="../qt-ui/models.cpp" line="2454"/> <source>No buddies</source> <translation type="unfinished"/> </message> @@ -404,11 +404,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1813"/> - <source>Advanced Settings</source> - <translation type="unfinished"/> - </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> @@ -421,6 +416,7 @@ </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"/> </message> @@ -660,27 +656,41 @@ </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1216"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2355"/> <source>ppO₂ max</source> <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1223"/> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> <source>ppO₂ min</source> <translation type="unfinished"/> </message> <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> + <source>P1 (medium)</source> + <extracomment>Suunto safety level</extracomment> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> + <source>P2 (high)</source> + <extracomment>Suunto safety level</extracomment> + <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> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> + <source>kg/ℓ</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="2362"/> - <source>ppO2 min</source> + <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> + <source>Apnoea</source> <translation type="unfinished"/> </message> <message> @@ -716,18 +726,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1429"/> - <source>P1 (some)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1434"/> - <source>P2 (much)</source> - <extracomment>Suunto safety level</extracomment> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1442"/> <source>Sample rate</source> <translation type="unfinished"/> @@ -809,11 +807,6 @@ <translation>鹽度</translation> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1697"/> - <source>kg/l</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1741"/> <source>MM/DD/YY</source> <translation type="unfinished"/> @@ -834,11 +827,6 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1940"/> - <source>Apnoe</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../qt-ui/configuredivecomputerdialog.ui" line="1945"/> <source>L16-GF OC</source> <translation type="unfinished"/> @@ -1797,7 +1785,7 @@ </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="303"/> - <source>Save New</source> + <source>Save new</source> <translation type="unfinished"/> </message> </context> @@ -1921,15 +1909,6 @@ <source>Upload dive data</source> <translation type="unfinished"/> </message> - <message> - <location filename="../qt-ui/diveshareexportdialog.ui" line="135"/> - <source><!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></source> - <translation type="unfinished"/> - </message> </context> <context> <name>DiveTripModel</name> @@ -2278,12 +2257,12 @@ p, li { white-space: pre-wrap; } <context> <name>ExtraDataModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Key</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="2669"/> + <location filename="../qt-ui/models.cpp" line="2720"/> <source>Value</source> <translation type="unfinished"/> </message> @@ -2335,7 +2314,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="513"/> + <location filename="../qt-ui/simplewidgets.cpp" line="515"/> <source>Location: </source> <translation type="unfinished"/> </message> @@ -2343,7 +2322,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2569"/> + <location filename="../qt-ui/models.cpp" line="2580"/> <source>No location set</source> <translation type="unfinished"/> </message> @@ -2468,8 +2447,8 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.ui" line="970"/> - <source>Additional data from dive computer</source> + <location filename="../qt-ui/maintab.ui" line="964"/> + <source>Aditional data from dive computer</source> <translation type="unfinished"/> </message> <message> @@ -3228,6 +3207,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>MultiFilter</name> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="554"/> + <source>Clear the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="558"/> + <source>Close this window and reset the filters</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/simplewidgets.cpp" line="562"/> + <source>Minimize this window</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>PlannerSettingsWidget</name> <message> <location filename="../qt-ui/diveplanner.cpp" line="479"/> @@ -3968,17 +3965,17 @@ p, li { white-space: pre-wrap; } <translation>關閉</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="28"/> + <location filename="../qt-ui/simplewidgets.cpp" line="30"/> <source>Average</source> <translation>平均</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="31"/> + <location filename="../qt-ui/simplewidgets.cpp" line="33"/> <source>Minimum</source> <translation>最低</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="34"/> + <location filename="../qt-ui/simplewidgets.cpp" line="36"/> <source>Maximum</source> <translation>最高</translation> </message> @@ -4070,12 +4067,12 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../qt-ui/renumber.ui" line="43"/> - <location filename="../qt-ui/simplewidgets.cpp" line="129"/> + <location filename="../qt-ui/simplewidgets.cpp" line="131"/> <source>New starting number</source> <translation>新的開始編號</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="127"/> + <location filename="../qt-ui/simplewidgets.cpp" line="129"/> <source>New number</source> <translation>新編號</translation> </message> @@ -4149,12 +4146,12 @@ p, li { white-space: pre-wrap; } <translation>哪個日期和時間將會被顯示在圖片上?</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="225"/> + <location filename="../qt-ui/simplewidgets.cpp" line="227"/> <source>Open image file</source> <translation>開啟影像檔</translation> </message> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="227"/> + <location filename="../qt-ui/simplewidgets.cpp" line="229"/> <source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source> <translation>影像檔案 (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation> </message> @@ -4296,7 +4293,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilter</name> <message> - <location filename="../qt-ui/simplewidgets.cpp" line="462"/> + <location filename="../qt-ui/simplewidgets.cpp" line="464"/> <source>Tags: </source> <translation type="unfinished"/> </message> @@ -4304,7 +4301,7 @@ p, li { white-space: pre-wrap; } <context> <name>TagFilterModel</name> <message> - <location filename="../qt-ui/models.cpp" line="2292"/> + <location filename="../qt-ui/models.cpp" line="2294"/> <source>Empty Tags</source> <translation type="unfinished"/> </message> @@ -4864,7 +4861,7 @@ Maximum</source> <translation>CSV 匯入最大支援 %d 欄位.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>none</source> <translation>無</translation> </message> @@ -4872,7 +4869,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="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>deco stop</source> <translation>減壓停留</translation> </message> @@ -4884,52 +4881,52 @@ Maximum</source> <message> <location filename="../cochran.c" line="366"/> <location filename="../cochran.c" line="405"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>rbt</source> <translation>剩餘滯底時間</translation> </message> <message> <location filename="../cochran.c" line="332"/> <location filename="../cochran.c" line="386"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ascent</source> <translation>上升</translation> </message> <message> <location filename="../cochran.c" line="375"/> <location filename="../cochran.c" line="422"/> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>ceiling</source> <translation>上限深度</translation> </message> <message> - <location filename="../libdivecomputer.c" line="141"/> + <location filename="../libdivecomputer.c" line="120"/> <source>workload</source> <translation>工作量</translation> </message> <message> <location filename="../cochran.c" line="391"/> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>transmitter</source> <translation>發射器</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>violation</source> <translation>違反</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>bookmark</source> <translation>書籤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>surface</source> <translation>水面</translation> </message> <message> - <location filename="../libdivecomputer.c" line="142"/> + <location filename="../libdivecomputer.c" line="121"/> <source>safety stop</source> <translation>安全停留</translation> </message> @@ -4937,188 +4934,188 @@ 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="143"/> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="122"/> + <location filename="../libdivecomputer.c" line="125"/> <source>gaschange</source> <translation>氣瓶更換</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (voluntary)</source> <translation>安全停留 (非必要)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="143"/> + <location filename="../libdivecomputer.c" line="122"/> <source>safety stop (mandatory)</source> <translation>安全停留 (強制性)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>deepstop</source> <translation>深停留</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>ceiling (safety stop)</source> <translation>上限深度 (安全停留)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <source>divetime</source> <translation>潛水時間</translation> </message> <message> - <location filename="../libdivecomputer.c" line="144"/> + <location filename="../libdivecomputer.c" line="123"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>maxdepth</source> <translation>最大深度</translation> </message> <message> <location filename="../cochran.c" line="344"/> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <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="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>PO2</source> <translation>PO2</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>airtime</source> <translation>空氣時間</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../libdivecomputer.c" line="145"/> + <location filename="../libdivecomputer.c" line="124"/> <source>heading</source> <translation>標題</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>tissue level warning</source> <translation>組織等級警告</translation> </message> <message> - <location filename="../libdivecomputer.c" line="146"/> + <location filename="../libdivecomputer.c" line="125"/> <source>non stop time</source> <translation>無停留時間</translation> </message> <message> - <location filename="../libdivecomputer.c" line="163"/> + <location filename="../libdivecomputer.c" line="142"/> <source>invalid event number</source> <translation>錯誤的事件編號</translation> </message> <message> - <location filename="../libdivecomputer.c" line="442"/> + <location filename="../libdivecomputer.c" line="421"/> <source>Unable to create parser for %s %s</source> <translation>無法建立解析 %s %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="448"/> + <location filename="../libdivecomputer.c" line="427"/> <source>Error registering the data</source> <translation>錯誤的登錄資料</translation> </message> <message> - <location filename="../libdivecomputer.c" line="456"/> + <location filename="../libdivecomputer.c" line="435"/> <source>Error parsing the datetime</source> <translation>日期時間解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="472"/> + <location filename="../libdivecomputer.c" line="451"/> <source>Dive %d: %s</source> <translation>潛水 %d: %s</translation> </message> <message> - <location filename="../libdivecomputer.c" line="476"/> + <location filename="../libdivecomputer.c" line="455"/> <source>Error parsing the divetime</source> <translation>潛水時間解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="485"/> + <location filename="../libdivecomputer.c" line="464"/> <source>Error parsing the maxdepth</source> <translation>最大深度解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="503"/> + <location filename="../libdivecomputer.c" line="482"/> <source>Error parsing temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="522"/> + <location filename="../libdivecomputer.c" line="501"/> <source>Error parsing the gas mix count</source> <translation>混合氣體數量解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="534"/> + <location filename="../libdivecomputer.c" line="513"/> <source>Error obtaining water salinity</source> <translation>得到錯誤的海水鹽度</translation> </message> <message> - <location filename="../libdivecomputer.c" line="542"/> + <location filename="../libdivecomputer.c" line="521"/> <source>Error obtaining surface pressure</source> <translation>得到錯誤的水面壓力</translation> </message> <message> - <location filename="../libdivecomputer.c" line="566"/> + <location filename="../libdivecomputer.c" line="545"/> <source>Error obtaining divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="583"/> + <location filename="../libdivecomputer.c" line="562"/> <source>Error parsing the gas mix</source> <translation>混合氣體解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="590"/> + <location filename="../libdivecomputer.c" line="569"/> <source>Error parsing the samples</source> <translation>樣本解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="727"/> + <location filename="../libdivecomputer.c" line="706"/> <source>Event: waiting for user action</source> <translation>事件: 等待使用者動作</translation> </message> <message> - <location filename="../libdivecomputer.c" line="735"/> + <location filename="../libdivecomputer.c" line="714"/> <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="795"/> + <location filename="../libdivecomputer.c" line="774"/> <source>Error registering the event handler.</source> <translation>錯誤的註冊程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="800"/> + <location filename="../libdivecomputer.c" line="779"/> <source>Error registering the cancellation handler.</source> <translation>錯誤的註冊取消程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="821"/> + <location filename="../libdivecomputer.c" line="800"/> <source>Dive data import error</source> <translation>匯入潛水資料錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="860"/> + <location filename="../libdivecomputer.c" line="839"/> <source>Unable to create libdivecomputer context</source> <translation>無法建立 libdivecomputer 上下文</translation> </message> <message> - <location filename="../libdivecomputer.c" line="867"/> + <location filename="../libdivecomputer.c" line="846"/> <source>Unable to open %s %s (%s)</source> <translation> 無法開啟 %s %s (%s)</translation> </message> |