diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-01-10 19:41:37 +0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-01-10 19:41:37 +0700 |
| commit | ab830b1d4fff0c68f9cad37ab8d079277ab5ca33 (patch) | |
| tree | 791f4448aa11566dd1ef095aacd59840828f0edf | |
| parent | 6037be946f91930f97a7c01000e0951aed2b1b1a (diff) | |
| parent | a15485874153336f416889c9cd31d620e89f1bd0 (diff) | |
| download | subsurface-ab830b1d4fff0c68f9cad37ab8d079277ab5ca33.tar.gz | |
Merge branch 'v4.0-branch'
Bring in the tag, the translations changes and edits preparing for 4.0.2
into master. This should make "git describe" on master create something
reasonably sensible...
26 files changed, 3645 insertions, 2746 deletions
@@ -1,5 +1,5 @@ -This is the README file for Subsurface 4.0.1 +This is the README file for Subsurface 4.0.2 After the release of Subsurface 3.1 the Subsurface developer team decided to make a major change in the development direction of the @@ -24,7 +24,7 @@ As always in a massive rewrite like this, there are still a small handful of known bugs and issues - please check ReleaseNotes.txt and our bug tracker at trac.hohndel.org. -The latest public version is Subsurface 4.0.1, released in January of 2014. +The latest public version is Subsurface 4.0.2, released in January of 2014. License: GPLv2 @@ -40,12 +40,12 @@ You can also browse the sources via gitweb at git.hohndel.org If you want the latest release (instead of the bleeding edge development version) you can either get this via -git checkout v4.0.1 (or whatever the last release is) +git checkout v4.0.2 (or whatever the last release is) if you have already cloned the git repository as shown above or you can get a tar ball from -http://subsurface.hohndel.org/downloads/Subsurface-4.0.1.tgz +http://subsurface.hohndel.org/downloads/Subsurface-4.0.2.tgz Basic Usage: diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index e10869497..a07542419 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,4 +1,4 @@ - Subsurface 4.0.1 + Subsurface 4.0.2 ================ The Subsurface developer team is proud to announce the release of the @@ -37,6 +37,23 @@ available, the tank pressure curve) in very innovative ways that give the user additional information on relative velocity (and momentary air consumption) during the dive through the coloring of the graphs. +New in version 4.0.2 (compared to Subsurface 4.0.1): +---------------------------------------------------- + +- fixed potential crash when importing dive data without dive computer + model information +- improve parsing of equipment data; this now accepts localized units + as well as input in units that are not the display units (so if you + run Subsurface in metric, but went diving in a place where weights + are in US Pounds (lbs), you can now enter the weight in lbs and + Subsurface does the right thing) +- fix temperature conversion when downloading data from Uemis SDA +- improve autocompletion to always be case insensitive +- improve selection handling in the dive list +- include event data in libdivecomputer dump +- improve profiles generated for dives with no depth samples and no + average depth + New in version 4.0.1 (compared to Subsurface 4.0): -------------------------------------------------- diff --git a/subsurface.pro b/subsurface.pro index 5b56e4fce..d230b3885 100644 --- a/subsurface.pro +++ b/subsurface.pro @@ -6,7 +6,7 @@ INCLUDEPATH += qt-ui $$PWD mac: TARGET = Subsurface else: TARGET = subsurface -VERSION = 4.0.1 +VERSION = 4.0.2 HEADERS = \ color.h \ diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index b0e010de8..db41b46bc 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="bg_BG"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg_BG" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Кликнете тук за да изтриете бутилка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Бутилката не може да бъде премахната</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Този газ се използвза. Само бутилки, които не се използват в гмуркане могат да бъдат премахнати.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Модел</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Име на устройство</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Прякор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Кликнете тук за да изтриете гмуркачески компютър.</translation> </message> @@ -178,12 +196,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>кб.фута/мин</translation> </message> @@ -408,67 +426,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>фута</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>паунда</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>водолазен костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>бут.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>местонахождение</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>макс CNS</translation> </message> @@ -618,22 +636,22 @@ Please, remove them first.</source> <translation>Регистър файлове (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Записването на libdivecomputer дъмп НЕ обновява списъка на гмуркания</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Изберете файл за libdivecomputer дъмп</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Дъмп файлове (*.bin)</translation> </message> @@ -710,13 +728,13 @@ Please, remove them first.</source> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Бележки</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -772,7 +790,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Бележки</translation> </message> @@ -903,13 +921,13 @@ Please, remove them first.</source> <translation>Добави система за тежест</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Местонахождение на пътуване</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Бележки за пътуване</translation> </message> @@ -924,51 +942,51 @@ Please, remove them first.</source> <translation>Отмяна</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Това пътуване се редактира.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Редактира се повече от едно гмуркане.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Това гмуркане се редактира.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/м</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>С</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>Ю</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>И</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>З</translation> </message> @@ -1986,72 +2004,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Гмуркане №%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Макс. дълбочина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Времетраене: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Използван газ:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Тежести:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Бележки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Водач:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Партньор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Водолазен костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Видимост:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Оценка:</translation> </message> @@ -2212,17 +2230,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>мл.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>бара</translation> </message> @@ -2230,7 +2248,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Информация</translation> </message> @@ -2238,12 +2256,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>кг</translation> </message> @@ -2299,97 +2317,117 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Тежест</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Кликнете тук за да изтриете система за тежест.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Година > Месец / Пътуване</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Продължителност Общо</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Най-късо</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Най-дълго</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Дълбочина (%1) Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Минимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Средно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -2708,82 +2746,82 @@ Maximum</source> <translation>Грешка при рaзряд на стойности</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Събитие: изчаквание на действие от потребителя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Грешка при регистриране на направление за събития</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Грешка при регистриране на направление за отменяне</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Грешка при вход на данни</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Не може да бъде създаден libdivecomputer контекст</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Не може да бъдe отворен %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Неразпозната стойност за проценти %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Не може да бъде напревен разбор на '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Не може да бъде напревен разбор на '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Базата данни не може да изпълни get_events. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Няма връзка към базата данни '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Грешка при заява към база данни '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Не може да бъде отворен стилов файл %s</translation> </message> @@ -3533,4 +3571,4 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Тревога: слаба батерия</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index 241e961b1..c5e7c13d1 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="da_DK"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Klik her vil fjerne flasken</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Flasken kan ikke fjernes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denne flaske er i brug. Kun flasker som ikke er i brug kan slettes</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Enheds ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Kaldenavn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Klik her, vil fjerne denne dykkercomputer</translation> </message> @@ -178,12 +196,12 @@ fjerne den valgte dykkercomputer?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -408,67 +426,67 @@ slet dem venligst først.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>Dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>fod</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>Dragt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>Flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>Sted</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>MaxCNS</translation> </message> @@ -618,22 +636,22 @@ slet dem venligst først.</translation> <translation>Logfiler (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Gem af libdivecomputer dump vil IKKE downloade dyk til listen</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Vælg fil for dykkercomputerens binære dump fil</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Dump filer (*.bin)</translation> </message> @@ -710,13 +728,13 @@ slet dem venligst først.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Dyk Noter</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Position</translation> </message> @@ -772,7 +790,7 @@ slet dem venligst først.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Noter</translation> </message> @@ -903,13 +921,13 @@ slet dem venligst først.</translation> <translation>Tilføj vægt system</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Tur position</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Tur noter</translation> </message> @@ -924,51 +942,51 @@ slet dem venligst først.</translation> <translation>Fortryd</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Turen er ved at blive rettet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Flere dyk bliver rettet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Dette dyk bliver rettet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>V</translation> </message> @@ -1986,72 +2004,72 @@ slet dem venligst først.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Dyk #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Varighed: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Gas brugt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Vægt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Noter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Makker:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Dragt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Sigt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -2212,17 +2230,17 @@ slet dem venligst først.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ slet dem venligst først.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Information</translation> </message> @@ -2238,12 +2256,12 @@ slet dem venligst først.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,97 +2317,117 @@ slet dem venligst først.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Vægt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Klik her, vil fjerne dette vægtsystem</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>År >Måned / Tur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Varighed Ialt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Længst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Gennemsnit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2708,82 +2746,82 @@ Gennemsnit</translation> <translation>Fejl i fortolkning af prøver</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Event: waiting for user action</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Fejl: registering the event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Fejl: registering the cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Import fejl i dykker data</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Kan ikke danne libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Kan ikke åbne %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation> Mærkelig procent læsning %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Kunne ikke fortolke '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Fejl i fortolkning af '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Database forespørgsel get_events fejlede </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Database forbindelse fejlede '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Database forespørgsel fejlede '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åbne stylesheet %s</translation> </message> @@ -3536,4 +3574,4 @@ Er Uemis Zurich tilsluttet korrekt?</translation> <translation>Lav batteri alarm</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 3793f274f..665177f9d 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de_CH"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_CH" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Flasche kann nicht entfernt werden</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation>psi</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation>l</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation>cuft</translation> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -154,22 +172,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Gerätebezeichnung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Gerätename</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Hier klicken entfernt diesen Tauchcomputer.</translation> </message> @@ -177,12 +195,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation> l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -407,67 +425,67 @@ Bitte entferne diese zuerst.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>Tauchplatz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>max. CNS</translation> </message> @@ -617,22 +635,22 @@ Bitte entferne diese zuerst.</translation> <translation>Log Dateien (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert wird</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Dump Dateien (*.bin)</translation> </message> @@ -709,13 +727,13 @@ Bitte entferne diese zuerst.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Notizen</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Ort</translation> </message> @@ -771,7 +789,7 @@ Bitte entferne diese zuerst.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -902,13 +920,13 @@ Bitte entferne diese zuerst.</translation> <translation>Gewichtsystem hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Ziel der Reise</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Reisenotizen</translation> </message> @@ -923,51 +941,51 @@ Bitte entferne diese zuerst.</translation> <translation>Abbrechen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1985,72 +2003,72 @@ Bitte entferne diese zuerst.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Tauchgang Nr %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Blei:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -2211,17 +2229,17 @@ Bitte entferne diese zuerst.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2229,7 +2247,7 @@ Bitte entferne diese zuerst.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Information</translation> </message> @@ -2237,12 +2255,12 @@ Bitte entferne diese zuerst.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2298,97 +2316,117 @@ Bitte entferne diese zuerst.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Hier klicken entfernt dieses Gewichtssystem.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation>kg</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation>US Pfund</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation>m</translation> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Jahr > Monat / Reise</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2707,82 +2745,82 @@ Mittel</translation> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Unverständliche Prozentangabe %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Fehler beim Lesen von '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Datenbank Anfrage 'get_events' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Datenbank Verbindung fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Datenbank Anfrage fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -3533,4 +3571,4 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Alarm: Batterie schwach</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 74ed36077..4314d565e 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="de_DE"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Flasche kann nicht entfernt werden</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation>psi</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation>l</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation>cu.ft.</translation> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -154,22 +172,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Gerätebezeichnung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Gerätename</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Hier klicken entfernt diesen Tauchcomputer.</translation> </message> @@ -177,12 +195,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -407,67 +425,67 @@ Bitte entferne diese zuerst.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>Datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>US Pfund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>Anzug</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>Flasche</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>Tauchplatz</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>AMV</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>max. CNS</translation> </message> @@ -617,22 +635,22 @@ Bitte entferne diese zuerst.</translation> <translation>Log Dateien (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Warnung</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Wenn der libdivecomputer Dump gespeichert wird, werden keine Tauchgänge zur Liste der Tauchgänge hinzugefügt.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Datei auswählen, in die der libdivecomputer Dump gespeichert wird</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Dump Dateien (*.bin)</translation> </message> @@ -709,13 +727,13 @@ Bitte entferne diese zuerst.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Notizen</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Ort</translation> </message> @@ -771,7 +789,7 @@ Bitte entferne diese zuerst.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -902,13 +920,13 @@ Bitte entferne diese zuerst.</translation> <translation>Gewichtsystem hinzufügen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Ziel der Reise</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Reisenotizen</translation> </message> @@ -923,51 +941,51 @@ Bitte entferne diese zuerst.</translation> <translation>Abbrechen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Diese Reise wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Mehrere Tauchgänge werden bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Dieser Tauchgang wird bearbeitet.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1985,72 +2003,72 @@ Bitte entferne diese zuerst.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Tauchgang Nr %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>max Tiefe: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Dauer: %1 Minuten</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Verw. Gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>AMV:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Blei:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Notizen:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Tauchgruppenleiter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Sicht:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> @@ -2211,17 +2229,17 @@ Bitte entferne diese zuerst.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2229,7 +2247,7 @@ Bitte entferne diese zuerst.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Information</translation> </message> @@ -2237,12 +2255,12 @@ Bitte entferne diese zuerst.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Beschreibung</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2298,97 +2316,117 @@ Bitte entferne diese zuerst.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Hier klicken entfernt dieses Gewichtssystem.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation>kg</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation>US Pfund</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation>m</translation> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Jahr > Monat / Reise</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Dauer Gesamt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Ø</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Kürzester</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Längster</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Tiefe (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>AMV (%1) Durchschnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2707,82 +2745,82 @@ Mittel</translation> <translation>Fehler beim Lesen der Samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Ereignis: warte auf Benutzeraktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Fehler beim Registrieren der Ereignisbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Fehler bei der Registrierung der Abbruchbehandlung</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Fehler beim Importieren der Tauchgangsdaten</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Fehler beim Erzeugen des libdivecomputer Contexts</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Fehler beim Öffnen von %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Unverständliche Prozentangabe %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Fehler beim Lesen von '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Datenbank Anfrage 'get_events' fehlgeschlagen. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Datenbank Verbindung fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Datenbank Anfrage fehlgeschlagen '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -3533,4 +3571,4 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Alarm: Batterie schwach</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index e4c112af3..b4b64b331 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="es_ES"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_ES" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -71,7 +69,7 @@ <message> <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> <source>CSV Files (*.csv);;All Files(*)</source> - <translation type="unfinished"></translation> + <translation>Archivos CSV (*.csv);;Todos los Archivos(*)</translation> </message> </context> <context> @@ -122,15 +120,35 @@ <translation>Pulsar aquí borrará esta botella</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>La botella no puede borrarse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Gas en uso. Solo pueden borrarse botellas que no se usan en la inmersión.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>ID del dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Nombre</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Pulsar aquí borrará este ordenador de buceo.</translation> </message> @@ -178,12 +196,12 @@ el ordenador de buceo seleccionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>Pie³/min</translation> </message> @@ -408,67 +426,67 @@ Por favor, bórralas antes.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>Fecha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>traje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>bot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>Ubicación</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -498,27 +516,27 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/> <source>no dives were selected</source> - <translation type="unfinished"></translation> + <translation>No se seleccionó ninguna inmersión</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/> <source>failed to create zip file for upload: %1</source> - <translation type="unfinished"></translation> + <translation>Fallo al crear archivo zip para subir: %1</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/> <source>cannot create temporary file: %1</source> - <translation type="unfinished"></translation> + <translation>No se puede crear archivo temporal: %1</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/> <source>internal error: %1</source> - <translation type="unfinished"></translation> + <translation>Error interno: %1</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/> <source>internal error</source> - <translation type="unfinished"></translation> + <translation>Error interno</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> @@ -610,32 +628,32 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"></translation> + <translation>Selecciona archivo para registro de descarga de libdivecomputer</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> <source>Log files (*.log)</source> - <translation type="unfinished"></translation> + <translation>Archivos Log (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Advertencia</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"></translation> + <translation>Guardar el volcado de libdivecomputer NO descargará buceos a la lista de inmersiones.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"></translation> + <translation>Selecciona archivo para el volcado binario del ordenador de buceo</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> - <translation type="unfinished"></translation> + <translation>Archivos de volcado (*.bin)</translation> </message> </context> <context> @@ -690,12 +708,12 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/> <source>Save libdivecomputer logfile</source> - <translation type="unfinished"></translation> + <translation>Guardar registro de libdivecomputer</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/> <source>Save libdivecomputer dumpfile</source> - <translation type="unfinished"></translation> + <translation>Guardar volcado de libdivecomputer</translation> </message> </context> <context> @@ -710,13 +728,13 @@ Por favor, bórralas antes.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Notas de la inmersión</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Ubicación</translation> </message> @@ -772,7 +790,7 @@ Por favor, bórralas antes.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -903,13 +921,13 @@ Por favor, bórralas antes.</translation> <translation>Añadir sistema de lastre</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Ubicación del viaje</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Notas del viaje</translation> </message> @@ -924,51 +942,51 @@ Por favor, bórralas antes.</translation> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Este viaje está siendo editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Se están editando varias inmersiones.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Esta inmersión esta siendo editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>O</translation> </message> @@ -1880,7 +1898,7 @@ Por favor, bórralas antes.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="172"/> <source>Unhide all events</source> - <translation type="unfinished"></translation> + <translation>Revelar todos los eventos</translation> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="212"/> @@ -1986,72 +2004,72 @@ Por favor, bórralas antes.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>desconocido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Inmersión n.º %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Profundidad máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Duración: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Gas usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Lastre:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Compañero:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Traje:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Visibilidad:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Calificación:</translation> </message> @@ -2212,17 +2230,17 @@ Por favor, bórralas antes.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Descripción</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ Por favor, bórralas antes.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Información</translation> </message> @@ -2238,12 +2256,12 @@ Por favor, bórralas antes.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Descripción</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,97 +2317,117 @@ Por favor, bórralas antes.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Pulsar aquí borrará este sistema de lastre.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Año > Mes / Viaje</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>N.º</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Duración Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Más corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Más larga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Profundidad (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>CAS (%1) Medio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2708,84 +2746,84 @@ Media</translation> <translation>Error al analizar las muestras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Evento: esperando acción del usuario</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Error al registrar el manejador de eventos</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Error al registrar el manejador de cancelación</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Error al importar datos de inmersiones</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>No es posible crear el contexto de libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>No se pudo abrir %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Porcentaje extraño al leer %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>No se pudo analizar «%s». </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>No se pudo analizar «%s»</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Falló la petición get_events a la base de datos. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Falló la conexión a la base de datos «%s». </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Falló la petición a la base de datos «%s». </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> - <translation type="unfinished"></translation> + <translation>No se puede abrir la hoja de estilo %s</translation> </message> <message> <location filename="../planner.c" line="99"/> @@ -3534,4 +3572,4 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Alerta de batería baja</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index 75e70755a..92c1b8fdd 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="et_EE"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -71,7 +69,7 @@ <message> <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> <source>CSV Files (*.csv);;All Files(*)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -122,15 +120,35 @@ <translation>Siin klikkamine eemaldab selle ballooni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Ballooni ei saa eemaldada</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>See gaas on kasutusel. Eemaldada saab ainult neid balloone mida ei kasutata sellel sukeldumisel.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Mudel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Seadme ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Hüüdnimi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Siin klikkamine eemaldab selle kompuutri.</translation> </message> @@ -178,12 +196,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>kuupjalga/min</translation> </message> @@ -408,67 +426,67 @@ palun eemalda need esmalt.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>kuupäev</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>jalg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>nael</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>ülikond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>ball</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>asukoht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>Hapnikumürgistuse ühik (OTU)</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -498,27 +516,27 @@ palun eemalda need esmalt.</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/> <source>no dives were selected</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/> <source>failed to create zip file for upload: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/> <source>cannot create temporary file: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/> <source>internal error: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/> <source>internal error</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> @@ -610,32 +628,32 @@ palun eemalda need esmalt.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> <source>Log files (*.log)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Hoiatus</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -690,12 +708,12 @@ palun eemalda need esmalt.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/> <source>Save libdivecomputer logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/> <source>Save libdivecomputer dumpfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -710,13 +728,13 @@ palun eemalda need esmalt.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Sukeldumise märkmed</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Asukoht</translation> </message> @@ -772,7 +790,7 @@ palun eemalda need esmalt.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Märkmed</translation> </message> @@ -903,13 +921,13 @@ palun eemalda need esmalt.</translation> <translation>Lisa raskuste süsteem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Väljasõidu koht</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Väljasõidu märkmed</translation> </message> @@ -924,51 +942,51 @@ palun eemalda need esmalt.</translation> <translation>Loobu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Seda väljasõitu toimetatakse</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Mitut sukeldumist toimetatakse</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Seda sukeldumist toimetatakse.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>tundmatu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1880,7 +1898,7 @@ palun eemalda need esmalt.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="172"/> <source>Unhide all events</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="212"/> @@ -1986,72 +2004,72 @@ palun eemalda need esmalt.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>tundmatu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Sukeldumine #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Max sügavus: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Kestus: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Kasutatud gaas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Raskused:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Märkmed:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Semu:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Ülikond:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Nähtavus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Hinne:</translation> </message> @@ -2212,17 +2230,17 @@ palun eemalda need esmalt.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Kirjeldus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ palun eemalda need esmalt.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Info</translation> </message> @@ -2238,12 +2256,12 @@ palun eemalda need esmalt.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Kirjeldus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,97 +2317,117 @@ palun eemalda need esmalt.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Tüüp</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Raskus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Siin klikkamine kõrvaldab selle raskuste süsteemi</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Aasta > Kuu / väljasõit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Kestus kokku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Lühim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Pikim</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Sügavus (%1) keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Miinimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maksimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) keskmine</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2708,84 +2746,84 @@ Maksimum</translation> <translation>Viga proovide tuvastamisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Sündmus: ootan kasutaja sekkumist</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Viga sündmuste draiveri registreerimisel.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Viga tühistamise draiveri registreerimisel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Viga sukeldumise andmete impordil</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Ei saa luua libdivecomputer konteksti</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Ei saa avada %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Imelik protsendilugem %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>'%s' tuvastamine ebaõnnestus. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>'%s' tuvastamine ebaõnnestus</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Andmebaasi päring get_events ebaõnnestus. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Andmebaasi ühendus ebaõnnestus '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Andmebaasi päring ebaõnnestus '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="99"/> @@ -3531,4 +3569,4 @@ Kas Uemis Zurich on ühendatud korrektselt?</translation> <translation>Patarei tühjenemise häire</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index db72e72e9..20f505c0c 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="fi_FI"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Poista säiliö.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Säiliötä ei voida poistaa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Malli</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Laite ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Lempinimi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Poista sukellustietokone.</translation> </message> @@ -178,12 +196,12 @@ poistaa valitun sukellustietokoneen?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>jalkaa/min</translation> </message> @@ -408,67 +426,67 @@ poista ensin pysähdykset.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>päiväys</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>pauna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>puku</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>säiliöt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>kohde</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>Happikertymä</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -618,22 +636,22 @@ poista ensin pysähdykset.</translation> <translation>Lokitiedostot (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Varoitus</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Kun sukellustietokoneen latauksesta tallennetaan raakatiedosto, sukelluksia EI tallenneta sukelluslistaan.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Valitse tiedosto sukellustietokoneen latauksen raakatiedostolle</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Raakatiedostot (*.bin)</translation> </message> @@ -710,13 +728,13 @@ poista ensin pysähdykset.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Muistiinpanot</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Kohde</translation> </message> @@ -772,7 +790,7 @@ poista ensin pysähdykset.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> @@ -903,13 +921,13 @@ poista ensin pysähdykset.</translation> <translation>Lisää painojärjestelmä</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Matkakohde</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Matkan muistiinpanot</translation> </message> @@ -924,51 +942,51 @@ poista ensin pysähdykset.</translation> <translation>Peruuta</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Tätä sukellusretkeä muokataan.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Muokataan useita sukelluksia.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Tätä sukellusta muokataan.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1987,72 +2005,72 @@ poista ensin pysähdykset.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Sukellus #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Suurin syvyys: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Kesto: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Kaasu:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>Pintakulutus:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Painot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Muistiinpanot:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Sukellusvanhin:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Sukelluspari:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Puku:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Näkyvyys:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Yleisarvio:</translation> </message> @@ -2213,17 +2231,17 @@ poista ensin pysähdykset.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Kuvaus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2231,7 +2249,7 @@ poista ensin pysähdykset.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Tiedot</translation> </message> @@ -2239,12 +2257,12 @@ poista ensin pysähdykset.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Kuvaus</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2300,97 +2318,117 @@ poista ensin pysähdykset.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Tyyppi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Painot</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Poista painojärjestelmä näpäyttämällä ikonia.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Vuosi > Kuukausi / Retki</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Kesto Kokonais</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Keskim.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Lyhin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Pisin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Dyvyys (%1) Keski</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Alin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Suurin</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Keski</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Lämpö (%1) @@ -2709,82 +2747,82 @@ Keski</translation> <translation>Virhe näytteiden tulkinnassa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Tapahtuma: odotetaan käyttäjän toimia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Virhe tapahtumakäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Virhe perumiskäsittelijän rekisteröinnissä.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Virhe sukellusten jäsentämisessä</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>libdivecomputer-kontekstin luominen epäonnistui</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Avaaminen epäonnistui: %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Outo prosenttiosuus: %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Tiedoston '%s' lukeminen epäonnistui. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Tiedoston '%s' lukeminen epäonnistui.</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Tietokantakysely 'get_events' (nouda tapahtumat) epäonnistui. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Tietokantayhteys epäonnistui '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Tietokantakysely epäonnistui '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Tyylitiedoston %1 avaus ei onnistu</translation> </message> @@ -3535,4 +3573,4 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Hälytys: heikko paristo</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 29f75af0c..cdf648b59 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="fr_FR"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Cliquer ici retirera ce bloc.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Le bloc ne peut être retiré.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Modèle</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Identifiant du périphérique</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Nom</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Cliquer ici retirera cet ordinateur de plongée.</translation> </message> @@ -178,12 +196,12 @@ l'ordinateur de plongée sélectionné ?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -408,67 +426,67 @@ Veuillez d'abord les supprimer.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>date</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>pied</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>livre US</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>combinaison</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>blk</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>lieu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>Consommation d'air</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>SNCmax</translation> </message> @@ -618,22 +636,22 @@ Veuillez d'abord les supprimer.</translation> <translation>Fichier de log (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Avertissement</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Sauvegarder le déchargement de libdivecomputer ne téléchargera pas les plongées dans la liste des plongées</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Choisir le fichier pour le fichier de déchargement de libdivecomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Fichiers de décharge (*.bin)</translation> </message> @@ -710,13 +728,13 @@ Veuillez d'abord les supprimer.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Notes de plongée</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Lieu</translation> </message> @@ -772,7 +790,7 @@ Veuillez d'abord les supprimer.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -903,13 +921,13 @@ Veuillez d'abord les supprimer.</translation> <translation>Ajouter un système de poids</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Lieu du groupe</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Notes du groupe</translation> </message> @@ -924,51 +942,51 @@ Veuillez d'abord les supprimer.</translation> <translation>Annuler</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Ce groupe est en train d'être édité.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Plusieurs plongées sont en train d'être éditées.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Cette plongée est en train d'être éditée.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>O</translation> </message> @@ -1986,72 +2004,72 @@ Veuillez d'abord les supprimer.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>inconnu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Plongée #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Profondeur max: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Durée: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Gaz utilisé:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>Consommation d'air:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>SNC Max.:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Poids:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Notes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Chef de palanquée:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Binôme:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Combinaison:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Visi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Évaluation:</translation> </message> @@ -2212,17 +2230,17 @@ Veuillez d'abord les supprimer.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ Veuillez d'abord les supprimer.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Information</translation> </message> @@ -2238,12 +2256,12 @@ Veuillez d'abord les supprimer.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Description</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,97 +2317,117 @@ Veuillez d'abord les supprimer.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Poids</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Cliquer ici retirera ce système de poids.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Année > Mois / Groupe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>N°</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Durée Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Plus courte</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Plus longue</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Pronfondeur (%&) Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Moyenne</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2708,82 +2746,82 @@ Moyenne</translation> <translation>Impossible d'analyser des échantillons</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <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="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Impossible d'enregistrer le gestionnaire d'événement.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Impossible d'enregistrer le gestionnaire d'annulation.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Erreur à l'import des données de plongées</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Impossible de créer un contexte libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Impossible d'ouvrir %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Valeur de pourcentage étrange %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Impossible d'analyser « %s ». </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Impossible d'analyser « %s »</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Échec de la requête. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Connexion à la base de données impossible '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Échec de la requête '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Impossible d'ouvrir le feuille de style %s</translation> </message> @@ -3534,4 +3572,4 @@ Est-ce que votre Uemis Zurich est branché correctement ?</translation> <translation>Alarme de batterie faible</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index bc9fce4c0..2161bb23c 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="he"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -21,12 +19,12 @@ <message> <location filename="../qt-ui/csvimportdialog.ui" line="209"/> <source>Field Separator</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="65"/> <source>Field Configuration</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="14"/> @@ -51,17 +49,17 @@ <message> <location filename="../qt-ui/csvimportdialog.ui" line="155"/> <source>Cns</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="175"/> <source>Stopdepth</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="227"/> <source>Pre-configured imports</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> @@ -104,12 +102,12 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>Switch at</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>He%</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> @@ -119,17 +117,37 @@ <message> <location filename="../qt-ui/models.cpp" line="151"/> <source>Clicking here will remove this cylinder.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> </message> </context> <context> @@ -154,35 +172,35 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>דגם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>מזהה התקן</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>כינוי</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>ליטר לדקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>רגל מעוקב לדקה</translation> </message> @@ -207,32 +225,32 @@ <message> <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>collapse others</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="709"/> <source>remove dive(s) from trip</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="710"/> <source>create new trip above</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="711"/> <source>add dive(s) to trip immediately above</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="714"/> <source>merge trip with trip above</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="715"/> <source>merge trip with trip below</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="719"/> @@ -257,7 +275,7 @@ <message> <location filename="../qt-ui/divelistview.cpp" line="729"/> <source>shift times</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="732"/> @@ -373,7 +391,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>CC Set Point</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="1305"/> @@ -391,85 +409,85 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/diveplanner.cpp" line="955"/> <source>Dive Planner Points</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="958"/> <source>Available Gases</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="975"/> <source>add dive data point</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>תאריך</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>מטר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>רגל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>דקה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> - <translation>lbs</translation> + <translation>ליברה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>חליפה</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>מיקום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>צריכת אוויר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -482,7 +500,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/> @@ -609,7 +627,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> @@ -617,24 +635,24 @@ Please, remove them first.</source> <translation>קבצי יומן (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>אזהרה</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -689,12 +707,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/> <source>Save libdivecomputer logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/> <source>Save libdivecomputer dumpfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -702,20 +720,20 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/globe.cpp" line="100"/> <source>Edit Selected Dive Locations</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>הערות צלילה</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>מיקום</translation> </message> @@ -771,7 +789,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>הערות</translation> </message> @@ -902,13 +920,13 @@ Please, remove them first.</source> <translation>הוסף מערכת משקולות</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>מיקום</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>הערות</translation> </message> @@ -923,51 +941,51 @@ Please, remove them first.</source> <translation>בטל</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>צלילות מרובות בעריכה.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>צלילה זו בעריכה.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>לדקה</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>צ</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>ד</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>מז</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>מע</translation> </message> @@ -992,7 +1010,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="169"/> <source>&View</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="190"/> @@ -1111,12 +1129,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="318"/> <source>Import from &dive computer</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="326"/> <source>Import &GPS data from Subsurface Service</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="329"/> @@ -1126,7 +1144,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="334"/> <source>&Edit Device Names</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="342"/> @@ -1146,7 +1164,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/mainwindow.ui" line="363"/> <source>Toggle &Zoom</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="368"/> @@ -1458,12 +1476,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="214"/> <source>Default Cylinder</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="220"/> <source>Use Default Cylinder</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="256"/> @@ -1660,12 +1678,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/preferences.ui" line="758"/> <source>Calculate NDL/TTS</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="821"/> <source>GFLow at max depth</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="781"/> @@ -1859,12 +1877,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/profilegraphics.cpp" line="134"/> <source>Add Gas Change</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="145"/> <source>Add Bookmark</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="153"/> @@ -1925,12 +1943,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/profilegraphics.cpp" line="531"/> <source>Measure properties of dive segments</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="532"/> <source>Scale your dive to screen size</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="545"/> @@ -1967,7 +1985,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/profilegraphics.cpp" line="1035"/> <source>Bailing out to OC</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="1037"/> @@ -1985,74 +2003,74 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>צלילות מס %1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>עומק מקסימלי: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>זמן: %1 דקות</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>אוויר שנוצל:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>צריכת אויר:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>משקולות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>הערות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>מדריך צלילה:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>בן זוג:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>חליפה:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>ראות:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -2065,7 +2083,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/diveplanner.cpp" line="734"/> <source>Remove this Point</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/kmessagewidget.cpp" line="58"/> @@ -2111,17 +2129,17 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/shifttimes.ui" line="20"/> <source>Shift selected times</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="37"/> <source>Shift times of selected dives by</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="73"/> <source>h:mm</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="83"/> @@ -2144,7 +2162,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/about.cpp" line="19"/> <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, and others, 2011, 2012, 2013</span></source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/about.cpp" line="23"/> @@ -2211,17 +2229,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>תיאור</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2229,7 +2247,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>מידע נוסף</translation> </message> @@ -2237,12 +2255,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>תיאור</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>קילוגרם</translation> </message> @@ -2298,97 +2316,117 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>סוג</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>משקל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>שנה > חודש / טיול</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>משך כולל</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> קצר ביותר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> ארוך ביותר</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>עומק (%1) ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> מינימום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> מקסימום</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>צריכת אויר (%1) ממוצע</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>טמפ' (%1) @@ -2506,13 +2544,13 @@ Maximum</source> <location filename="../file.c" line="269"/> <location filename="../file.c" line="271"/> <source>Failed to read '%s'. Use import for CSV files.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../file.c" line="355"/> <location filename="../file.c" line="357"/> <source>Maximum number of supported columns on CSV import is %d</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="139"/> @@ -2527,7 +2565,7 @@ Maximum</source> <message> <location filename="../libdivecomputer.c" line="139"/> <source>rbt</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="139"/> @@ -2557,7 +2595,7 @@ Maximum</source> <message> <location filename="../libdivecomputer.c" line="140"/> <source>bookmark</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="140"/> @@ -2604,7 +2642,7 @@ Maximum</source> <location filename="../libdivecomputer.c" line="142"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="143"/> @@ -2654,17 +2692,17 @@ Maximum</source> <message> <location filename="../libdivecomputer.c" line="401"/> <source>Unable to create parser for %s %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="407"/> <source>Error registering the data</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="416"/> <source>Error parsing the datetime</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="433"/> @@ -2674,17 +2712,17 @@ Maximum</source> <message> <location filename="../libdivecomputer.c" line="438"/> <source>Error parsing the divetime</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="448"/> <source>Error parsing the maxdepth</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="458"/> <source>Error parsing the gas mix count</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="471"/> @@ -2694,93 +2732,93 @@ Maximum</source> <message> <location filename="../libdivecomputer.c" line="480"/> <source>Error obtaining surface pressure</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="489"/> <source>Error parsing the gas mix</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../libdivecomputer.c" line="497"/> <source>Error parsing the samples</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>אירוע: מחכה לפעולה של המשתמש</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>שגיאת יבוא נתוני צלילה</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>לא ניתן לפתוח את %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>שאילתת מסד נתונים של Get_events נכשל </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>החיבור למסד הנתונים נכשל '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>שאילתת מסד נתונים נכשל '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation> </message> @@ -2798,7 +2836,7 @@ Maximum</source> <message> <location filename="../planner.c" line="321"/> <source>Too many gas mixes</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="501"/> @@ -2807,19 +2845,19 @@ Subsurface dive plan based on GFlow = %.0f and GFhigh = %.0f </source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="542"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s </source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="551"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s </source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="562"/> @@ -2839,66 +2877,66 @@ based on GFlow = %.0f and GFhigh = %.0f <location filename="../planner.c" line="581"/> <source>%.0f%s of %s </source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="778"/> <source>ean</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1210"/> <source>%s P:%d %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1215"/> <source>%s T:%.1f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1222"/> <source>%s V:%.2f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1308"/> <source>%s Calculated ceiling %.0f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1315"/> <source>%s Tissue %.0fmin: %.0f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1262"/> <source>%s Safetystop:%umin @ %.0f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1206"/> <source>@:%d:%02d D:%.1f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1226"/> <source>%s SAC:%2.1fl/min</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1265"/> <source>%s Safetystop:unkn time @ %.0f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1270"/> @@ -2925,37 +2963,37 @@ In deco</source> <location filename="../profile.c" line="1282"/> <source>%s NDL:%umin</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1230"/> <source>%s CNS:%u%%</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1234"/> <source>%s pO%s:%.2fbar</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1238"/> <source>%s pN%s:%.2fbar</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1242"/> <source>%s pHe:%.2fbar</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1247"/> <source>%s MOD:%d%s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1254"/> @@ -2972,43 +3010,43 @@ EADD:%d%s</translation> <location filename="../profile.c" line="1287"/> <source>%s Deco:%umin @ %.0f %s (calc)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1296"/> <source>%s In deco (calc)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1299"/> <source>%s NDL:%umin (calc)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1303"/> <source>%s TTS:%umin (calc)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1412"/> <source>%sT: %d:%02d min</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1416"/> <location filename="../profile.c" line="1420"/> <location filename="../profile.c" line="1424"/> <source>%s %sD:%.1f%s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1428"/> <source>%s %sD:%.1f%s </source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1432"/> @@ -3024,7 +3062,7 @@ TTS:%umin (calc)</source> <message> <location filename="../profile.c" line="1447"/> <source>%s %sP:%d %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-gui.cpp" line="309"/> @@ -3091,7 +3129,7 @@ TTS:%umin (calc)</source> <message> <location filename="../dive.c" line="15"/> <source>wreck</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../dive.c" line="15"/> @@ -3161,12 +3199,12 @@ TTS:%umin (calc)</source> <message> <location filename="../statistics.c" line="220"/> <source>%dd %dh %dmin</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../statistics.c" line="222"/> <source>%dh %dmin</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../statistics.c" line="233"/> @@ -3298,20 +3336,20 @@ TTS:%umin (calc)</source> <source>Uemis Zurich: File System is almost full Disconnect/reconnect the dive computer and click 'Retry'</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="25"/> <source>Uemis Zurich: File System is full Disconnect/reconnect the dive computer and try again</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="26"/> <source>Short write to req.txt file Is the Uemis Zurich plugged in correctly?</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="106"/> @@ -3331,17 +3369,17 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis-downloader.c" line="413"/> <source>divelog entry id</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="415"/> <source>divespot data id</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="417"/> <source>more data dive id</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="597"/> @@ -3351,7 +3389,7 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis-downloader.c" line="597"/> <source>semidry</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="597"/> @@ -3361,7 +3399,7 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis-downloader.c" line="598"/> <source>shorty</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="598"/> @@ -3386,7 +3424,7 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis-downloader.c" line="598"/> <source>2 pcs full suit</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="599"/> @@ -3396,12 +3434,12 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis-downloader.c" line="781"/> <source>Init Communication</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="783"/> <source>Uemis init failed</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis-downloader.c" line="794"/> @@ -3411,7 +3449,7 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis.c" line="194"/> <source>Safety Stop Violation</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="196"/> @@ -3426,22 +3464,22 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis.c" line="201"/> <source>PO2 Green Warning</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="204"/> <source>PO2 Ascend Warning</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="206"/> <source>PO2 Ascend Alarm</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="210"/> <source>Tank Pressure Info</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="212"/> @@ -3456,37 +3494,37 @@ Is the Uemis Zurich plugged in correctly?</source> <message> <location filename="../uemis.c" line="216"/> <source>Tank Change Suggested</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="218"/> <source>Depth Limit Exceeded</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="220"/> <source>Max Deco Time Warning</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="222"/> <source>Dive Time Info</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="224"/> <source>Dive Time Alert</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="226"/> <source>Marker</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="228"/> <source>No Tank Data</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../uemis.c" line="230"/> @@ -3499,4 +3537,4 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>התראת סוללה חלשה</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 15b29152e..5be6c7df8 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -115,20 +115,40 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="154"/> + <location filename="../qt-ui/models.cpp" line="151"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="376"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="377"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -152,22 +172,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1233"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1233"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1233"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Naziv uređaja</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +195,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1094"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1096"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation type="unfinished"/> </message> @@ -404,67 +424,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1137"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1138"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1140"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1140"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1141"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1143"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1143"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1144"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1145"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1147"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1148"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -613,22 +633,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> </message> @@ -705,13 +725,13 @@ Please, remove them first.</source> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Bilješke</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Lokacija</translation> </message> @@ -767,7 +787,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Bilješke</translation> </message> @@ -898,13 +918,13 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation type="unfinished"/> </message> @@ -919,51 +939,51 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1981,72 +2001,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1606"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1611"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1614"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1621"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1628"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1630"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1632"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1637"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1646"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1652"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -2207,17 +2227,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="759"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="759"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="759"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2225,7 +2245,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2233,12 +2253,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="631"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="631"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2294,88 +2314,108 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="391"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Vrsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="391"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Težina</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="451"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1409"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1410"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>Br.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1412"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1415"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1416"/> - <location filename="../qt-ui/models.cpp" line="1419"/> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1420"/> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1418"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -2390,13 +2430,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="62"/> - <location filename="../qt-gui.cpp" line="348"/> + <location filename="../qt-gui.cpp" line="350"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="66"/> - <location filename="../qt-gui.cpp" line="351"/> + <location filename="../qt-gui.cpp" line="353"/> <source>psi</source> <translation>psi</translation> </message> @@ -2408,7 +2448,7 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="108"/> - <location filename="../qt-gui.cpp" line="332"/> + <location filename="../qt-gui.cpp" line="334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -2693,82 +2733,82 @@ Maximum</source> <translation>Greška pri parsiranju uzoraka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Događaj: čekanje na korisničku akciju</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Greška pri registraciji event handlera.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Greška pri registraciji cancellation handlera</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Greška pri uvozu podataka</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Ne mogu kreirati libdivecomputer kontekst</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Nije uspjelo otvaranje %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="575"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Neobično očitanje postotka %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1712"/> + <location filename="../parse-xml.c" line="1616"/> <source>Failed to parse '%s'. </source> <translation>Nije uspjelo parsiranje '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1713"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Nije uspjelo parsiranje '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1911"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Neuspjeo get_events na bazi. </translation> </message> <message> - <location filename="../parse-xml.c" line="1946"/> + <location filename="../parse-xml.c" line="1850"/> <source>Database connection failed '%s'. </source> <translation>Neuspjelo spajanje na bazu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1953"/> + <location filename="../parse-xml.c" line="1857"/> <source>Database query failed '%s'. </source> <translation>Neuspjeo upit na bazu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2013"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -3043,23 +3083,23 @@ TTS:%umin (calc)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="493"/> + <location filename="../qt-gui.cpp" line="495"/> <source>%1, %2 %3, %4 %5:%6</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="506"/> + <location filename="../qt-gui.cpp" line="508"/> <source>%1 %2, %3 %4:%5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="519"/> + <location filename="../qt-gui.cpp" line="521"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="526"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 65fdc0097..524b9c505 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -115,20 +115,40 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="154"/> + <location filename="../qt-ui/models.cpp" line="151"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="376"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="377"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -152,22 +172,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1233"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1233"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>ID Perangkat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1233"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Nama Panggilan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +195,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1094"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>I/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1096"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -404,67 +424,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1137"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1138"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1140"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1140"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1141"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1143"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1143"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1144"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1145"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1147"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1148"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -613,22 +633,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> </message> @@ -705,13 +725,13 @@ Please, remove them first.</source> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Catatan Selam</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Lokasi</translation> </message> @@ -767,7 +787,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Catatan</translation> </message> @@ -898,13 +918,13 @@ Please, remove them first.</source> <translation>Tambah Sistem Berat</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Lokasi Perjalanan</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Catatan Perjalanan</translation> </message> @@ -919,51 +939,51 @@ Please, remove them first.</source> <translation>Batal</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/menit</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>U</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>T</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>B</translation> </message> @@ -1981,72 +2001,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1606"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1611"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Selam #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1614"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Kedalaman Maks: 1% 2%</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1621"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Durasi: %1 menit</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1628"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1630"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1632"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1637"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1646"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1652"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -2207,17 +2227,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="759"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Penjelasan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="759"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="759"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2225,7 +2245,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Informasi</translation> </message> @@ -2233,12 +2253,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="631"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Penjelasan</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="631"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kgkg</translation> </message> @@ -2294,95 +2314,115 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="391"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Tipe</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="391"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Berat</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="451"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1409"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1410"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Total Durasi</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1412"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Terpendek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Terjauh</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1415"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Dalam (%1) Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1416"/> - <location filename="../qt-ui/models.cpp" line="1419"/> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1420"/> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maksimal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1418"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Rata-rata</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2398,13 +2438,13 @@ Rata-rata</translation> </message> <message> <location filename="../dive.c" line="62"/> - <location filename="../qt-gui.cpp" line="348"/> + <location filename="../qt-gui.cpp" line="350"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="66"/> - <location filename="../qt-gui.cpp" line="351"/> + <location filename="../qt-gui.cpp" line="353"/> <source>psi</source> <translation>psi</translation> </message> @@ -2416,7 +2456,7 @@ Rata-rata</translation> </message> <message> <location filename="../dive.c" line="108"/> - <location filename="../qt-gui.cpp" line="332"/> + <location filename="../qt-gui.cpp" line="334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -2701,77 +2741,77 @@ Rata-rata</translation> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"/> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="575"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1712"/> + <location filename="../parse-xml.c" line="1616"/> <source>Failed to parse '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1713"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1911"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1946"/> + <location filename="../parse-xml.c" line="1850"/> <source>Database connection failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="1953"/> + <location filename="../parse-xml.c" line="1857"/> <source>Database query failed '%s'. </source> <translation type="unfinished"/> </message> <message> - <location filename="../parse-xml.c" line="2013"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -3020,23 +3060,23 @@ TTS:%umin (calc)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="493"/> + <location filename="../qt-gui.cpp" line="495"/> <source>%1, %2 %3, %4 %5:%6</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="506"/> + <location filename="../qt-gui.cpp" line="508"/> <source>%1 %2, %3 %4:%5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="519"/> + <location filename="../qt-gui.cpp" line="521"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="526"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index a5c1d15ef..36e9877f3 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="it_IT"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -56,7 +54,7 @@ <message> <location filename="../qt-ui/csvimportdialog.ui" line="175"/> <source>Stopdepth</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/csvimportdialog.ui" line="227"/> @@ -71,7 +69,7 @@ <message> <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> <source>CSV Files (*.csv);;All Files(*)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -89,22 +87,22 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>WorkPress</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>StartPress</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>EndPress</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>Switch at</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/models.cpp" line="68"/> @@ -114,7 +112,7 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/models.cpp" line="151"/> @@ -122,15 +120,35 @@ <translation>Facendo click qui si rimuove la bombola.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>La bombola non può essere rimossa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Questo gas è in uso. Solo le bombole che non sono usate nell'immersione possono essere rimosse.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ il computer seleizonato?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Modello</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>ID della periferica</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Nickname</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Facendo click qui si rimuove questo computer.</translation> </message> @@ -178,12 +196,12 @@ il computer seleizonato?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>piedi cubi/min</translation> </message> @@ -208,7 +226,7 @@ il computer seleizonato?</translation> <message> <location filename="../qt-ui/divelistview.cpp" line="707"/> <source>collapse others</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="709"/> @@ -243,7 +261,7 @@ il computer seleizonato?</translation> <message> <location filename="../qt-ui/divelistview.cpp" line="721"/> <source>mark dive(s) invalid</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="727"/> @@ -258,12 +276,12 @@ il computer seleizonato?</translation> <message> <location filename="../qt-ui/divelistview.cpp" line="729"/> <source>shift times</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>upload dive(s) to divelogs.de</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="758"/> @@ -321,7 +339,7 @@ il computer seleizonato?</translation> <message> <location filename="../qt-ui/diveplanner.ui" line="181"/> <source>ATM Pressure</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -402,73 +420,73 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/diveplanner.cpp" line="975"/> <source>add dive data point</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>muta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>Luogo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>max CNS</translation> </message> @@ -478,114 +496,114 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/> <source>Invalid response from server</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="541"/> <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/> <source>no dives were selected</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/> <source>failed to create zip file for upload: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/> <source>cannot create temporary file: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/> <source>internal error: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/> <source>internal error</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> <source>Done</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> <source>Uploading dive list...</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/> <source>Downloading dive list...</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> <source>Download finished - %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/> <source>Corrupted download</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> <source>The archive could not be opened: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/> <source>Upload failed</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/> <source>Upload successful</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> <source>Login failed</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/> <source>Cannot parse response</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> <source>Error: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/> <source>Upload finished</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -609,32 +627,32 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> <source>Log files (*.log)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Avviso</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -657,7 +675,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="25"/> <source>Device or Mount Point</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="59"/> @@ -689,12 +707,12 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/> <source>Save libdivecomputer logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/> <source>Save libdivecomputer dumpfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -709,13 +727,13 @@ Per favore, rimuovile prima.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Note dell'immersione</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Luogo</translation> </message> @@ -771,7 +789,7 @@ Per favore, rimuovile prima.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Note</translation> </message> @@ -902,13 +920,13 @@ Per favore, rimuovile prima.</translation> <translation>Aggiungi un tipo di pesi</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Luogo del viaggio</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Note di viaggio</translation> </message> @@ -923,51 +941,51 @@ Per favore, rimuovile prima.</translation> <translation>Annulla</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Questo viaggio è stato editato.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Si stanno modificando immersioni multiple.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Si sta modificando questa immersione </translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1146,7 +1164,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/mainwindow.ui" line="363"/> <source>Toggle &Zoom</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.ui" line="368"/> @@ -1318,17 +1336,17 @@ Per favore, rimuovile prima.</translation> <location filename="../qt-ui/mainwindow.cpp" line="255"/> <location filename="../qt-ui/mainwindow.cpp" line="709"/> <source>Please save or cancel the current dive edit before closing the file.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="228"/> <source>Please save or cancel the current dive edit before trying to plan a dive.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="291"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="503"/> @@ -1363,7 +1381,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/mainwindow.cpp" line="878"/> <source>First finish the current edition before trying to do another.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="201"/> @@ -1385,7 +1403,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/mainwindow.cpp" line="111"/> <source>Please save or cancel the current dive edit before opening a new file.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="202"/> @@ -1418,7 +1436,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1493,12 +1511,12 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1513,22 +1531,22 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1538,17 +1556,17 @@ Per favore, rimuovile prima.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1625,7 +1643,7 @@ Per favore, rimuovile prima.</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> @@ -1640,7 +1658,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/preferences.ui" line="704"/> <source>draw ceiling red</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="715"/> @@ -1695,12 +1713,12 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/preferences.cpp" line="196"/> <source>Restart required</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.cpp" line="197"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.cpp" line="230"/> @@ -1718,17 +1736,17 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1829,22 +1847,22 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/printoptions.ui" line="219"/> <source>Sizing heights (% of layout)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printoptions.ui" line="256"/> <source>Profile height (43% - 85%)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printoptions.ui" line="278"/> <source>Other data height (8% - 17%)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printoptions.ui" line="338"/> <source>Notes height (0% - 52%)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printoptions.ui" line="354"/> @@ -1879,7 +1897,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="172"/> <source>Unhide all events</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="212"/> @@ -1925,7 +1943,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="531"/> <source>Measure properties of dive segments</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="532"/> @@ -1940,7 +1958,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="631"/> <source>pN</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="657"/> @@ -1950,7 +1968,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="681"/> <source>pO</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="769"/> @@ -1985,72 +2003,72 @@ Per favore, rimuovile prima.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Immersione #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Massima profondità: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Durata: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Miscela usata:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Pesi:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Note:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Compagno:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Muta:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Valutazione:</translation> </message> @@ -2090,7 +2108,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/globe.cpp" line="238"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -2111,12 +2129,12 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/shifttimes.ui" line="20"/> <source>Shift selected times</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="37"/> <source>Shift times of selected dives by</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/shifttimes.ui" line="73"/> @@ -2172,12 +2190,12 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/> <source>Download finished</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/> <source>Download error: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/> @@ -2211,17 +2229,17 @@ Per favore, rimuovile prima.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Descrizione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2229,7 +2247,7 @@ Per favore, rimuovile prima.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Informazione</translation> </message> @@ -2237,12 +2255,12 @@ Per favore, rimuovile prima.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Descrizione</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2252,7 +2270,7 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/webservices.ui" line="14"/> <source>Webservice Connection</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2287,108 +2305,128 @@ Per favore, rimuovile prima.</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/> <source>Operation timed out</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/> <source>Transfering data...</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Facendo click qui si rimuove il sistema di pesi.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Anno > Mese / Viaggio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Durata Totale</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Più corta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Più lunga</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Profondità (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Massimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Media</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2707,42 +2745,42 @@ Media</translation> <translation>Errore analizzando i campioni</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Evento: in attesa dell' azione dell'utente.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Errore registrando il gestore degli eventi.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Errore registrando il gestore della cancellazione.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Errore importazione dati immersione</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Impossibile creare un contesto libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Impossibile aprire %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Lettura di strane percentuali %s @@ -2750,42 +2788,42 @@ Media</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Impossibile analizzare '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Impossibile analizzare '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Interrogazione get_events fallita. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Connessione al database fallita '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Interrogazione al database fallita '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="99"/> @@ -2873,7 +2911,7 @@ T:%.1f %s</source> <location filename="../profile.c" line="1222"/> <source>%s V:%.2f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1308"/> @@ -2886,7 +2924,7 @@ Calcolo ceiling %.0f %s</translation> <location filename="../profile.c" line="1315"/> <source>%s Tissue %.0fmin: %.0f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1262"/> @@ -2898,13 +2936,13 @@ Safetystop:%umin @ %.0f %s</source> <location filename="../profile.c" line="1206"/> <source>@:%d:%02d D:%.1f %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1226"/> <source>%s SAC:%2.1fl/min</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1265"/> @@ -2981,7 +3019,7 @@ EADD:%d%s</translation> <location filename="../profile.c" line="1287"/> <source>%s Deco:%umin @ %.0f %s (calc)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1296"/> @@ -3007,36 +3045,36 @@ TTS:%umin (calc)</translation> <message> <location filename="../profile.c" line="1412"/> <source>%sT: %d:%02d min</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1416"/> <location filename="../profile.c" line="1420"/> <location filename="../profile.c" line="1424"/> <source>%s %sD:%.1f%s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1428"/> <source>%s %sD:%.1f%s </source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1432"/> <source>%s%sV:%.2f%s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1436"/> <location filename="../profile.c" line="1440"/> <source>%s %sV:%.2f%s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../profile.c" line="1447"/> <source>%s %sP:%d %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-gui.cpp" line="309"/> @@ -3051,7 +3089,7 @@ TTS:%umin (calc)</translation> <message> <location filename="../qt-gui.cpp" line="495"/> <source>%1, %2 %3, %4 %5:%6</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-gui.cpp" line="508"/> @@ -3516,4 +3554,4 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Allarme: Batteria scarica</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 5db831792..ed8f18825 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="nb_NO"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb_NO" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -71,7 +69,7 @@ <message> <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> <source>CSV Files (*.csv);;All Files(*)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -122,15 +120,35 @@ <translation>Klikk her for å fjerne denne flaska.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Flaska kan ikke fjernes</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denne gassen er i bruk. Du kan bare fjerne flasker som ikke er i bruk.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -154,22 +172,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Enhets-ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Navn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Klikk her for å fjerne denne computeren.</translation> </message> @@ -177,12 +195,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>ft³/min</translation> </message> @@ -407,67 +425,67 @@ Fjern dem før du gjør dette.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>dato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>drakt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>flaske</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>sted</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>maks CNS</translation> </message> @@ -497,27 +515,27 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/> <source>no dives were selected</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/> <source>failed to create zip file for upload: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/> <source>cannot create temporary file: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/> <source>internal error: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/> <source>internal error</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> @@ -609,32 +627,32 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> <source>Log files (*.log)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Advarsel</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -689,12 +707,12 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/> <source>Save libdivecomputer logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/> <source>Save libdivecomputer dumpfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -709,13 +727,13 @@ Fjern dem før du gjør dette.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Dykk</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Sted</translation> </message> @@ -771,7 +789,7 @@ Fjern dem før du gjør dette.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -902,13 +920,13 @@ Fjern dem før du gjør dette.</translation> <translation>Legg til vektsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Tursted</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Turnotater</translation> </message> @@ -923,51 +941,51 @@ Fjern dem før du gjør dette.</translation> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Denne turen redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Flere dykk redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Dette dykket redigeres.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>Ø</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>V</translation> </message> @@ -1879,7 +1897,7 @@ Fjern dem før du gjør dette.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="172"/> <source>Unhide all events</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="212"/> @@ -1985,72 +2003,72 @@ Fjern dem før du gjør dette.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>ukjent</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Dykk nr. %1- %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Max dybde: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Varighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Gass brukt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Mac. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Vekter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Notater:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> @@ -2211,17 +2229,17 @@ Fjern dem før du gjør dette.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2229,7 +2247,7 @@ Fjern dem før du gjør dette.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Informasjon</translation> </message> @@ -2237,12 +2255,12 @@ Fjern dem før du gjør dette.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Beskrivelse</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2298,97 +2316,117 @@ Fjern dem før du gjør dette.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Vekt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Klikk her for å fjerne dette vektsystemet</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>År > Måned / Tur</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Varighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Kortest</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Lengst</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Dybde (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maksimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Snitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2707,84 +2745,84 @@ Snitt</translation> <translation>Feil ved lesing av detaljer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Hendelse: Venter på bruker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Feil ved registrering av hendelseshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Feil ved registrering av avbruddshåndterer.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Feil ved import av dykkedata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Kunne ikke opprette kontekst for libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Fikk ikke åpnet %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Rar lesing av prosent %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Kunne ikke lese '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Databasespørring get_events feilet. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Databaseforbindelse feilet '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Databasespørring feilet '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="99"/> @@ -3533,4 +3571,4 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Alarm: dårlig batteri</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index d39cff705..04fe05b9a 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="nl_NL"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Klik hier om de fles te verwijderen.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Fles kan niet verwijderd worden</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden kunnen verwijderd worden.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Toestel ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Apparaatnaam</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Klik hier om deze duikcomputer te verwijderen.</translation> </message> @@ -178,12 +196,12 @@ duikcomputer wilt verwijderen?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -408,67 +426,67 @@ Verwijder deze eerst.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>US pond</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>duikpak</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>fles</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>locatie</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>max. CNS</translation> </message> @@ -618,22 +636,22 @@ Verwijder deze eerst.</translation> <translation>Log bestanden (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Duiken worden NIET in de duiklijst geladen als u de libdivecomputer dump opslaat.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Kies een bestand voor de duikcomputer binaire dump</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Dump bestanden (*.bin)</translation> </message> @@ -710,13 +728,13 @@ Verwijder deze eerst.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Duiknotities</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Locatie</translation> </message> @@ -772,7 +790,7 @@ Verwijder deze eerst.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Notities</translation> </message> @@ -903,13 +921,13 @@ Verwijder deze eerst.</translation> <translation>Gewichtssysteem toevoegen</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Trip locatie</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Trip Nota's</translation> </message> @@ -924,51 +942,51 @@ Verwijder deze eerst.</translation> <translation>Annuleren</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Deze trip wordt bewerkt.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Meerdere duiken worden bewerkt.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Deze duik wordt bewerkt.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>onbekend</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>Z</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>O</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1986,72 +2004,72 @@ Verwijder deze eerst.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>onbekend</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Duik #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Max diepte: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Duur: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Verbruikt gas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>Gasverbruik:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Gewichten:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Nota's:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Duikpak:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Zichtbaarheid:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Beoordeling:</translation> </message> @@ -2212,17 +2230,17 @@ Verwijder deze eerst.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Beschrijving</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ Verwijder deze eerst.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Informatie</translation> </message> @@ -2238,12 +2256,12 @@ Verwijder deze eerst.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Beschrijving</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,97 +2317,117 @@ Verwijder deze eerst.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Type</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Gewicht</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Hier klikken om het gewichtssysteem te verwijderen</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Jaar > Maand / Trip</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>Nr.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Duur Totaal</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Kortste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Langste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Diepte (%1) Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>Gasverbruik (%1) Gemiddeld</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2708,82 +2746,82 @@ Maximum</translation> <translation>Fout bij het verwerken van de samples</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Event: wachten op handeling van gebruiker</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Fout bij het registreren van de event handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Fout bij het registreren van de cancellation handler.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Fout bij importeren van duikdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Kan geen context creëren voor libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Fout bij openen van %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Vreemde percentage %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Fout bij analyseren van '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Fout bij analyse van '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Database-query get_events mislukt. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Databaseconnectie is mislukt '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Database-query mislukt: '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Kan de stylesheet %s niet openen</translation> </message> @@ -3534,4 +3572,4 @@ Is de Uemis Zurich correkt aangesloten?</translation> <translation>Alarm: Lege batterij</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 28cae8181..4fa770815 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="pl_PL"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Kliknięcie tu usunie butlę z listy.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Butla nie może być usunięta.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ten gaz jest używany. Można usuwać tylko butle, których nie używasz.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>ID urządzenia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Nazwa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Kliknięcie tu usunie komputer nurkowy.</translation> </message> @@ -178,12 +196,12 @@ wybrany komputer nurkowy?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation> l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -408,67 +426,67 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>skafander</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>butla</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>miejsce</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -618,22 +636,22 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Pliki logów (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Użycie libdivecomputer w trybie diagnostycznym spowoduje, że pobrane nurkowania NIE ZOSTANĄ dodane do listy nurkowań.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Wybierz plik do którego zapisane zostaną dane binarne</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Pliki binarne (*.bin)</translation> </message> @@ -710,13 +728,13 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Opis nurkowania</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Miejsce</translation> </message> @@ -772,7 +790,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Opis</translation> </message> @@ -903,13 +921,13 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Dodaj balast</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Miejsce nurkowań</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Opis nurkowań</translation> </message> @@ -924,51 +942,51 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <translation>Anuluj</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Ta grupa nurkowań jest obecnie edytowana.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Kilka nurkowań jest obecnie edytowanych.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>To nurkowanie jest obecnie edytowane.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1986,72 +2004,72 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Nurkownie #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Max głębokość: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Czas: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Użyty gaz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Balast:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Opis:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Skafander:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Widzialność:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Ocena:</translation> </message> @@ -2212,17 +2230,17 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Opis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Informacje</translation> </message> @@ -2238,12 +2256,12 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Opis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,92 +2317,112 @@ poza zakresem. Proszę je najpierw usunąć.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Rodzaj</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Balast</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Kliknięcie tu usunie ten balast z listy.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Rok > Miesiąc / grupa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Czas trwania całkowity</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation>średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation>najkrótszy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation>najdłuższy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Głębokość (%1) średnia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation>minimalna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation>maksymalna</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) średni</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -2703,82 +2741,82 @@ Maximum</source> <translation>Błąd podczas przetwarzania próbek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Oczekiwanie na działanie użytkownika</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Błąd rejestracji uchwytu (event handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Błąd rejestracji uchwytu (cancellation handler)</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Błąd podczas importowania danych</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Nie można utworzyć kontekstu libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Nie udało się otworzyć %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Podejrzany skład procentowy %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Nie udało się przetworzyć '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Nie udało się przetworzyć '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Zapytanie bazy danych get_events nie powiodło się.⏎ </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Błąd połączenia z bazą danych '%s'.⏎ </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Błąd komunikacji z bazą danych '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Nie można otworzyć arkusza stylów %s</translation> </message> @@ -3529,4 +3567,4 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>Alarm: niski poziom baterii</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index 986b16a80..2e78e1929 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="pt_BR"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -71,7 +69,7 @@ <message> <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> <source>CSV Files (*.csv);;All Files(*)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -114,7 +112,7 @@ <message> <location filename="../qt-ui/models.cpp" line="68"/> <source>O</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/models.cpp" line="151"/> @@ -122,15 +120,35 @@ <translation>Ao clicar aqui irá eliminar esta garrafa.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>A garrafa não pode ser eliminada</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Apelido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Ao clicar aqui irá remover este computador de mergulho.</translation> </message> @@ -178,12 +196,12 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>pés cúbicos/min</translation> </message> @@ -243,7 +261,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/divelistview.cpp" line="721"/> <source>mark dive(s) invalid</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="727"/> @@ -263,7 +281,7 @@ remover o computador de mergulho seleccionado?</translation> <message> <location filename="../qt-ui/divelistview.cpp" line="732"/> <source>upload dive(s) to divelogs.de</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/divelistview.cpp" line="758"/> @@ -408,67 +426,67 @@ Por favor, remova-os primeiro</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>fato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>garrafa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>local</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>CNS máx</translation> </message> @@ -478,114 +496,114 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="480"/> <source>Invalid response from server</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="488"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="534"/> <source>Expected XML tag 'DiveDates' not found</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="541"/> <source>Malformed XML response. Line %1: %2</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/> <source>no dives were selected</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/> <source>failed to create zip file for upload: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/> <source>cannot create temporary file: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/> <source>internal error: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/> <source>internal error</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> <location filename="../qt-ui/subsurfacewebservices.cpp" line="786"/> <source>Done</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="624"/> <source>Uploading dive list...</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="655"/> <source>Downloading dive list...</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="703"/> <source>Downloading %1 dives...</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="746"/> <source>Download finished - %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="763"/> <source>Corrupted download</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="764"/> <source>The archive could not be opened: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="800"/> <source>Upload failed</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="803"/> <source>Upload successful</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="806"/> <source>Login failed</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="809"/> <source>Cannot parse response</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="821"/> <source>Error: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="787"/> <source>Upload finished</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -609,32 +627,32 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> <source>Log files (*.log)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -689,12 +707,12 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/> <source>Save libdivecomputer logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/> <source>Save libdivecomputer dumpfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -709,13 +727,13 @@ Por favor, remova-os primeiro</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Notas do mergulho</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Local</translation> </message> @@ -771,7 +789,7 @@ Por favor, remova-os primeiro</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -902,13 +920,13 @@ Por favor, remova-os primeiro</translation> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Local da viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Notas sobre a viagem</translation> </message> @@ -923,51 +941,51 @@ Por favor, remova-os primeiro</translation> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Esta viagem está a ser editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Estão a ser editados vários mergulhos.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Este mergulho está a ser editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>L</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>O</translation> </message> @@ -1333,7 +1351,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/mainwindow.cpp" line="503"/> <source>User Manual</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/mainwindow.cpp" line="507"/> @@ -1418,7 +1436,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/preferences.ui" line="115"/> <source>Language</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="141"/> @@ -1493,12 +1511,12 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/preferences.ui" line="314"/> <source>meter</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="324"/> <source>feet</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="341"/> @@ -1513,22 +1531,22 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/preferences.ui" line="368"/> <source>liter</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="378"/> <source>cu ft</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="395"/> <source>celsius</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="405"/> <source>fahrenheit</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="422"/> @@ -1538,17 +1556,17 @@ Por favor, remova-os primeiro</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="510"/> <source>pO₂</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="551"/> <source>pN₂</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="837"/> <source>System Default</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="857"/> @@ -1625,7 +1643,7 @@ Por favor, remova-os primeiro</translation> <message utf8="true"> <location filename="../qt-ui/preferences.ui" line="656"/> <source>max ppO₂</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="672"/> @@ -1695,12 +1713,12 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/preferences.cpp" line="196"/> <source>Restart required</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.cpp" line="197"/> <source>To correctly load a new language you must restart Subsurface.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.cpp" line="230"/> @@ -1718,17 +1736,17 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/printdialog.cpp" line="39"/> <source>&Preview</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="43"/> <source>P&rint</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="47"/> <source>&Close</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printdialog.cpp" line="61"/> @@ -1879,7 +1897,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="172"/> <source>Unhide all events</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="212"/> @@ -1940,7 +1958,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="631"/> <source>pN</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="657"/> @@ -1950,7 +1968,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="681"/> <source>pO</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="769"/> @@ -1985,72 +2003,72 @@ Por favor, remova-os primeiro</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Mergulho #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Profundidade máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Gás usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>Consumo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>CNS máximo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Guia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Companheiro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Fato:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -2090,7 +2108,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/globe.cpp" line="238"/> <source>Move the map and double-click to set the dive location</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -2172,12 +2190,12 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="388"/> <source>Download finished</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="402"/> <source>Download error: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="411"/> @@ -2211,17 +2229,17 @@ Por favor, remova-os primeiro</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2229,7 +2247,7 @@ Por favor, remova-os primeiro</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Informação</translation> </message> @@ -2237,12 +2255,12 @@ Por favor, remova-os primeiro</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2252,7 +2270,7 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/webservices.ui" line="14"/> <source>Webservice Connection</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/webservices.ui" line="25"/> @@ -2287,108 +2305,128 @@ Por favor, remova-os primeiro</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="253"/> <source>Operation timed out</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="274"/> <source>Transfering data...</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Ao clicar aqui irá remover este sistema de lastro</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Ano >Mês / Viagem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>Consumo (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2707,42 +2745,42 @@ Médio</translation> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Evento: à espera de acção do utilizador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Erro no registo do "event handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do "cancellation handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Erro a importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto do libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Leitura estranha das percentagens %s @@ -2750,42 +2788,42 @@ Médio</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Falha na análise de '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>A consulta "obter eventos" falhou. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Falha na ligação à base de dados '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>A consulta da base de dados falhou '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="99"/> @@ -3534,4 +3572,4 @@ O Uemis Zurich está bem ligado?</translation> <translation>Alerta de nível de bateria</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index b8cbf7816..28c7610e2 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="pt_PT"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Ao clicar aqui irá eliminar esta garrafa.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>A garrafa não pode ser eliminada</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>A mistura está a ser usada. Apenas pode remover as garrafas não usadas durante o mergulho.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation>psi</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation>l</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation>pés^3</translation> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Modelo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>ID do dispositivo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Alcunha</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Ao clicar aqui irá remover este computador de mergulho.</translation> </message> @@ -178,12 +196,12 @@ remover o computador de mergulho seleccionado?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>pés cúbicos/min</translation> </message> @@ -408,67 +426,67 @@ Por favor, remova-os primeiro</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>data</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>pés</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>libras</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>fato</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>garrafa</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>local</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>Consumo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>CNS máx</translation> </message> @@ -618,22 +636,22 @@ Por favor, remova-os primeiro</translation> <translation>Ficheiros log (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Aviso</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>Gravar a descarga do libdivecomputer não vai descarregar os mergulhos para a lista</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Seleccione o ficheiro para gravar a descarga binária do libdivecomputer</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Ficheiros dump (*.bin)</translation> </message> @@ -710,13 +728,13 @@ Por favor, remova-os primeiro</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Notas</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Local</translation> </message> @@ -772,7 +790,7 @@ Por favor, remova-os primeiro</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -903,13 +921,13 @@ Por favor, remova-os primeiro</translation> <translation>Adicionar sistema de lastro</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Local da viagem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Notas sobre a viagem</translation> </message> @@ -924,51 +942,51 @@ Por favor, remova-os primeiro</translation> <translation>Cancelar</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Esta viagem está a ser editada.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Estão a ser editados vários mergulhos.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Este mergulho está a ser editado.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>O</translation> </message> @@ -1986,72 +2004,72 @@ Por favor, remova-os primeiro</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Mergulho #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Prof. Máxima: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Duração: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Gás usado:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>Consumo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>CNS máximo:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Lastro:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Notas:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Guia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Companheiros:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Fato:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Visibilidade:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Classificação:</translation> </message> @@ -2212,17 +2230,17 @@ Por favor, remova-os primeiro</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ Por favor, remova-os primeiro</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Informação</translation> </message> @@ -2238,12 +2256,12 @@ Por favor, remova-os primeiro</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Descrição</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,97 +2317,117 @@ Por favor, remova-os primeiro</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Tipo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Peso</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Ao clicar aqui irá remover este sistema de lastro</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation>kg</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation>libra</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation>pés</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation>m</translation> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Ano >Mês / Viagem</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Duração Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Mais curto</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Mais longo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Profundidade (%1) Média</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Mínimo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Máximo</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>Consumo (%1) Médio</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temperatura (%1) @@ -2708,42 +2746,42 @@ Média</translation> <translation>Erro na análise das amostras</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Evento: à espera de acção do utilizador</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Erro no registo do "event handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Erro no registo do "cancellation handler".</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Erro a importar os dados do mergulho</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Não é possivel criar contexto do libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Não se consegue abrir %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Leitura estranha das percentagens %s @@ -2751,40 +2789,40 @@ Média</translation> </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Falha na análise de '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>A consulta "obter eventos" falhou. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Falha na ligação à base de dados '%s' </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>A consulta da base de dados falhou '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Não é possível abrir a folha de estilos %s</translation> </message> @@ -3535,4 +3573,4 @@ O Uemis Zurich está bem ligado?</translation> <translation>Alerta de Bateria Baixa</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 4a8db693a..c7b7e9a59 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="ru_RU"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Удалить этот баллон.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Баллон не может быть удален</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Нельзя удалять баллоны, которые используются в погружении.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Модель</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Идентификатор</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Имя устройства</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Удалить этот дайв-компьютер.</translation> </message> @@ -178,12 +196,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>куб.фут/мин</translation> </message> @@ -408,67 +426,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>дата</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>костюм</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>баллон</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>местоположение</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>макс.CNS</translation> </message> @@ -618,22 +636,22 @@ Please, remove them first.</source> <translation>Файлы журналов (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Дамп-файлы (*.bin)</translation> </message> @@ -710,13 +728,13 @@ Please, remove them first.</source> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Погружение</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -772,7 +790,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -903,13 +921,13 @@ Please, remove them first.</source> <translation>Добавить груз</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Местонахождение поездки</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Заметки к поездке</translation> </message> @@ -924,51 +942,51 @@ Please, remove them first.</source> <translation>Отмена</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>С</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>Ю</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>В</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>З</translation> </message> @@ -1986,72 +2004,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Погружение №%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Макс. глубина: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Длительность: %1 мин</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Газы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Макс. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Грузы:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Заметки:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Видимость:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> @@ -2212,17 +2230,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>мл</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>Бар</translation> </message> @@ -2230,7 +2248,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Информация</translation> </message> @@ -2238,12 +2256,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Описание</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>кг</translation> </message> @@ -2299,97 +2317,117 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Тип</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Удалить эту грузовую систему.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Год > Месяц / Поездка</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Длительность Общее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> Кратчайшее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> Самое долгое</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Глубина (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Минимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Максимум</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Среднее</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Темп. (%1) @@ -2708,82 +2746,82 @@ Maximum</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Странное значение процентов %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Ошибка разбора '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Ошибка запроса get_events в БД. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Ошибка соединения с БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Ошибка запроса к БД '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> @@ -3534,4 +3572,4 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Тревога: заряд батареи</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index c28b3b35f..94108cb37 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="sk_SK"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -122,15 +120,35 @@ <translation>Kliknutím sem vymažeš fľašu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Flaša nemôže byť vymazaná</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Táto fľaša sa používa. Len fšaše nepoužité na ponor môžu byť vymazané.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ vybraný počítač?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Model</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>ID zariadenia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Voliteľný názov</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Kliknutín sem vymažeš počítač.</translation> </message> @@ -178,12 +196,12 @@ vybraný počítač?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -339,7 +357,7 @@ vybraný počítač?</translation> <message> <location filename="../qt-ui/diveplanner.cpp" line="384"/> <source>Handler Position Error</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="385"/> @@ -374,7 +392,7 @@ Vymaž ich prosím.</translation> <message> <location filename="../qt-ui/diveplanner.cpp" line="1100"/> <source>CC Set Point</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="1305"/> @@ -392,7 +410,7 @@ Vymaž ich prosím.</translation> <message> <location filename="../qt-ui/diveplanner.cpp" line="955"/> <source>Dive Planner Points</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/diveplanner.cpp" line="958"/> @@ -402,73 +420,73 @@ Vymaž ich prosím.</translation> <message> <location filename="../qt-ui/diveplanner.cpp" line="975"/> <source>add dive data point</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>dátum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>US libra</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>oblek</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>fl.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>lokalita</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>max. CNS</translation> </message> @@ -610,7 +628,7 @@ Vymaž ich prosím.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> @@ -618,22 +636,22 @@ Vymaž ich prosím.</translation> <translation>Log súbory</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Upozornenie</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation>Dump súbory</translation> </message> @@ -710,13 +728,13 @@ Vymaž ich prosím.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Poznámky</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Miesto</translation> </message> @@ -772,7 +790,7 @@ Vymaž ich prosím.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Poznámky</translation> </message> @@ -903,13 +921,13 @@ Vymaž ich prosím.</translation> <translation>Pridaj závažia</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Lokalita</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Poznámky</translation> </message> @@ -924,51 +942,51 @@ Vymaž ich prosím.</translation> <translation>Zrušiť</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Táto akcia je editovaná.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Viaceré ponory sú editované.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Tento ponor sa edituje.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>neznámy</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1589,7 +1607,7 @@ Vymaž ich prosím.</translation> <message> <location filename="../qt-ui/preferences.ui" line="453"/> <source>Ascent/Descent speed denominator</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/preferences.ui" line="460"/> @@ -1830,7 +1848,7 @@ Vymaž ich prosím.</translation> <message> <location filename="../qt-ui/printoptions.ui" line="219"/> <source>Sizing heights (% of layout)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/printoptions.ui" line="256"/> @@ -1911,7 +1929,7 @@ Vymaž ich prosím.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="486"/> <source>Set Duration: 10 minutes</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="528"/> @@ -1926,7 +1944,7 @@ Vymaž ich prosím.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="531"/> <source>Measure properties of dive segments</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="532"/> @@ -1986,72 +2004,72 @@ Vymaž ich prosím.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>neznámy</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Ponor #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Max hĺbka: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Trvanie: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Použitá zmes:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Závažia:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Poznámky:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Viď:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Hodnotenie:</translation> </message> @@ -2212,17 +2230,17 @@ Vymaž ich prosím.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Popis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ Vymaž ich prosím.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Informácie</translation> </message> @@ -2238,12 +2256,12 @@ Vymaž ich prosím.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Popis</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,94 +2317,114 @@ Vymaž ich prosím.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Hmotnosť</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Kliknutim sem vymažeš záťažový systém.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>Rok > Mesiac / Akcia</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Trvanie Celkové</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation>Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation>Najkratší</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation>Najdlhší</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Hĺbka (%1) Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Priemer</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2705,82 +2743,82 @@ Maximum</translation> <translation>Chyba spracovania vzoriek</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Udalosť: Čakanie na vstup uživateľa</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Chyba registrácia správcu udalosti.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Chyba registrácie správcu ukončenia</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Chyba importu dát</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Problém inicializácie libdivecomputer</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Nie je možné otvoriť %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Zvláštne percenta v %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Chyba pri spracovaní '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Chyba pri spracovaní '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Neúspešná požiadavka: get_events.⏎ </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Spojenie s databázou zlýhalo '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Požiadavka na databázu zlyhala '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation>Neviem otvoriť šablónu </translation> </message> @@ -3531,4 +3569,4 @@ Je Uemis Zurich korektne pripojený?</translation> <translation>Alarm: Slabá batéria</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_source.ts b/translations/subsurface_source.ts index e8c084810..532107603 100644 --- a/translations/subsurface_source.ts +++ b/translations/subsurface_source.ts @@ -122,15 +122,35 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -154,22 +174,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"></translation> </message> @@ -177,12 +197,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation type="unfinished"></translation> </message> @@ -406,67 +426,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation type="unfinished"></translation> </message> @@ -615,22 +635,22 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation type="unfinished"></translation> </message> @@ -707,13 +727,13 @@ Please, remove them first.</source> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation type="unfinished"></translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation type="unfinished"></translation> </message> @@ -769,7 +789,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation type="unfinished"></translation> </message> @@ -900,13 +920,13 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation type="unfinished"></translation> </message> @@ -921,51 +941,51 @@ Please, remove them first.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation type="unfinished"></translation> </message> @@ -1983,72 +2003,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation type="unfinished"></translation> </message> @@ -2209,17 +2229,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation type="unfinished"></translation> </message> @@ -2227,7 +2247,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation type="unfinished"></translation> </message> @@ -2235,12 +2255,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation type="unfinished"></translation> </message> @@ -2296,88 +2316,108 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation type="unfinished"></translation> @@ -2695,77 +2735,77 @@ Maximum</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> + <location filename="../parse-xml.c" line="1616"/> <source>Failed to parse '%s'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> + <location filename="../parse-xml.c" line="1850"/> <source>Database connection failed '%s'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> + <location filename="../parse-xml.c" line="1857"/> <source>Database query failed '%s'. </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"></translation> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index 6d027d622..5580970f1 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="sv_SE"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv_SE" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -71,7 +69,7 @@ <message> <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> <source>CSV Files (*.csv);;All Files(*)</source> - <translation type="unfinished"></translation> + <translation>CSV filer (*.csv);;Alla Filer(*)</translation> </message> </context> <context> @@ -122,15 +120,35 @@ <translation>Klicka här för att ta bort denna flaska</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>Flaska kan inte tas bort</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denna gas används. Bara flaskor som inte används kan tas bort</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ radera den valda dykdatorn?</translation> <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Modell</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>Enhetsid</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Enhetsnamn</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>Klicka här för att ta bort denna dykdator</translation> </message> @@ -178,12 +196,12 @@ radera den valda dykdatorn?</translation> <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation> l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation> cuft/min</translation> </message> @@ -408,67 +426,67 @@ vänligen ta bort dessa först.</translation> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>datum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>Min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>pund</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>dräkt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>flaska</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>plats</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>maxCNS</translation> </message> @@ -498,27 +516,27 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/> <source>no dives were selected</source> - <translation type="unfinished"></translation> + <translation>inga dyk var markerade</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/> <source>failed to create zip file for upload: %1</source> - <translation type="unfinished"></translation> + <translation>misslyckades med att skapa en zip-fil för uppladdning: %1</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/> <source>cannot create temporary file: %1</source> - <translation type="unfinished"></translation> + <translation>kunde inte skapa temporär fil: %1</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/> <source>internal error: %1</source> - <translation type="unfinished"></translation> + <translation>internt fel: %1</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/> <source>internal error</source> - <translation type="unfinished"></translation> + <translation>internt fel</translation> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> @@ -610,32 +628,32 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"></translation> + <translation>Välj fil som loggfil för nerladdningen ifrån dykdatorn</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> <source>Log files (*.log)</source> - <translation type="unfinished"></translation> + <translation>Loggfiler (*.log)</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>Varning</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"></translation> + <translation>Att spara en libdivecomputer-dump kommer inte att ladda ner dyken till dyklistan.</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"></translation> + <translation>Välj fil för binär dumpning av nerladdningen ifrån dykdatorn</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> - <translation type="unfinished"></translation> + <translation>Dumpfiler (*.bin)</translation> </message> </context> <context> @@ -690,12 +708,12 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/> <source>Save libdivecomputer logfile</source> - <translation type="unfinished"></translation> + <translation>Spara loggfil av nerladdningen ifrån dykdatorn</translation> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/> <source>Save libdivecomputer dumpfile</source> - <translation type="unfinished"></translation> + <translation>Spara dumpfil ifrån dykdatorn</translation> </message> </context> <context> @@ -710,13 +728,13 @@ vänligen ta bort dessa först.</translation> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Dykanteckningar</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Plats</translation> </message> @@ -772,7 +790,7 @@ vänligen ta bort dessa först.</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Anteckningar</translation> </message> @@ -903,13 +921,13 @@ vänligen ta bort dessa först.</translation> <translation>Lägg till Viktsystem</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>Resmål</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>Resmålsanteckningar</translation> </message> @@ -924,51 +942,51 @@ vänligen ta bort dessa först.</translation> <translation>Avbryt</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>Detta resmål håller på och ändras.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>Flera dyk håller på och ändras.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>Detta dyk håller på och ändras.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1880,7 +1898,7 @@ vänligen ta bort dessa först.</translation> <message> <location filename="../qt-ui/profilegraphics.cpp" line="172"/> <source>Unhide all events</source> - <translation type="unfinished"></translation> + <translation>Visa alla händelser</translation> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="212"/> @@ -1986,72 +2004,72 @@ vänligen ta bort dessa först.</translation> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>okänd</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>Dyk #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>Maxdjup: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>Varaktighet: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>Gas använd:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>Max. CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>Vikter:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>Anteckningar:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>Parkamrat:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>Dräkt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>Ranking:</translation> </message> @@ -2212,17 +2230,17 @@ vänligen ta bort dessa först.</translation> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>Beskrivning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ vänligen ta bort dessa först.</translation> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>Information</translation> </message> @@ -2238,12 +2256,12 @@ vänligen ta bort dessa först.</translation> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>Beskrivning</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,94 +2317,114 @@ vänligen ta bort dessa först.</translation> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Typ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Vikt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>Klicka här för att ta bort detta viktsystem</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>År > Månad / Resmål</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>Varaktighet Total</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation>Genomsnitt</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation>Kortaste</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation>Längsta</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>Djup (%1) Medel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> Minimum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> Maximum</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>SAC (%1) Medel</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>Temp. (%1) @@ -2705,84 +2743,84 @@ Medel</translation> <translation>Kunde inte tolka sampel</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>Händelse: väntar på användaren</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>Kunde inte registrera event-funktion</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>Kunde inte registrera avbrytningsrutin</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>Lyckades inte importera dykdata</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>Kan inte skapa libdivecomputer context</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Kunde inte öppna fil %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Konstig procent läsning %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>Kunde inte läsa '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Kunde inte läsa '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Databasfråga get_events misslyckades. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>Databasanslutning misslyckades '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>Databasfråga misslyckades '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> - <translation type="unfinished"></translation> + <translation>Kunde inte öppna formatmall %s</translation> </message> <message> <location filename="../planner.c" line="99"/> @@ -3531,4 +3569,4 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Batterivarning</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index c87bd337c..abc414b3e 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -115,20 +115,40 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="154"/> + <location filename="../qt-ui/models.cpp" line="151"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="376"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="377"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -152,22 +172,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1233"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>Mô hình</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1233"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1233"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>Tên</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1255"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation type="unfinished"/> </message> @@ -175,12 +195,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1094"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1096"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation type="unfinished"/> </message> @@ -404,67 +424,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1137"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1138"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1140"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1140"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1141"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1143"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>ký</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1143"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1144"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1145"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1147"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1148"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1149"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>CNS tối đa</translation> </message> @@ -613,22 +633,22 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> <translation type="unfinished"/> </message> @@ -705,13 +725,13 @@ Please, remove them first.</source> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>Ghi chú về lần lặn</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>Địa điểm</translation> </message> @@ -767,7 +787,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>Ghi chú</translation> </message> @@ -898,13 +918,13 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation type="unfinished"/> </message> @@ -919,51 +939,51 @@ Please, remove them first.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1981,72 +2001,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1606"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1611"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1614"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1621"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1626"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1628"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1630"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1632"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1637"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1644"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1646"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1648"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1652"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation type="unfinished"/> </message> @@ -2207,17 +2227,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="759"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="759"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="759"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2225,7 +2245,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation type="unfinished"/> </message> @@ -2233,12 +2253,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="631"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="631"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>ký</translation> </message> @@ -2294,88 +2314,108 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="391"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>Loại</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="391"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>Cân nặng</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="451"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation type="unfinished"/> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation type="unfinished"/> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1409"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1410"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1411"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1412"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1413"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1414"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1415"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1416"/> - <location filename="../qt-ui/models.cpp" line="1419"/> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1417"/> - <location filename="../qt-ui/models.cpp" line="1420"/> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1418"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/models.cpp" line="1421"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation type="unfinished"/> @@ -2390,13 +2430,13 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="62"/> - <location filename="../qt-gui.cpp" line="348"/> + <location filename="../qt-gui.cpp" line="350"/> <source>bar</source> <translation>bar</translation> </message> <message> <location filename="../dive.c" line="66"/> - <location filename="../qt-gui.cpp" line="351"/> + <location filename="../qt-gui.cpp" line="353"/> <source>psi</source> <translation>psi</translation> </message> @@ -2408,7 +2448,7 @@ Maximum</source> </message> <message> <location filename="../dive.c" line="108"/> - <location filename="../qt-gui.cpp" line="332"/> + <location filename="../qt-gui.cpp" line="334"/> <source>cuft</source> <translation>cuft</translation> </message> @@ -2693,82 +2733,82 @@ Maximum</source> <translation>Lỗi khi chuyển thông số các mẫu</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <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="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <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="673"/> + <location filename="../libdivecomputer.c" line="692"/> <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="693"/> + <location filename="../libdivecomputer.c" line="712"/> <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="729"/> + <location filename="../libdivecomputer.c" line="750"/> <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="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation>Không thể mở %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="575"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>Đang đọc tỉ lệ lạ %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1712"/> + <location filename="../parse-xml.c" line="1616"/> <source>Failed to parse '%s'. </source> <translation>Thất bại khi chuyển thông số '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1713"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>Thất bại khi chuyển thông số '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1911"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>Thất bại khi truy vấn việc nhận_sự kiện từ cơ sở dữ liệu. </translation> </message> <message> - <location filename="../parse-xml.c" line="1946"/> + <location filename="../parse-xml.c" line="1850"/> <source>Database connection failed '%s'. </source> <translation>Thất bại khi kết nối cơ sở dữ liệu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="1953"/> + <location filename="../parse-xml.c" line="1857"/> <source>Database query failed '%s'. </source> <translation>Thất bại khi truy vấn dữ liệu '%s'. </translation> </message> <message> - <location filename="../parse-xml.c" line="2013"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -3043,23 +3083,23 @@ TTS:%umin (calc)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="493"/> + <location filename="../qt-gui.cpp" line="495"/> <source>%1, %2 %3, %4 %5:%6</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="506"/> + <location filename="../qt-gui.cpp" line="508"/> <source>%1 %2, %3 %4:%5</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="519"/> + <location filename="../qt-gui.cpp" line="521"/> <source>%1 %2 (%3 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-gui.cpp" line="524"/> + <location filename="../qt-gui.cpp" line="526"/> <source>%1 %2 (1 dive)</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index e34c8310a..89eb644c3 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -1,6 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE TS> -<TS version="2.0" language="zh_TW"> +<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0"> <context> <name>CSVImportDialog</name> <message> @@ -71,7 +69,7 @@ <message> <location filename="../qt-ui/csvimportdialog.cpp" line="70"/> <source>CSV Files (*.csv);;All Files(*)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -122,15 +120,35 @@ <translation>於此處按下將移除此氣瓶.</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="372"/> + <location filename="../qt-ui/models.cpp" line="331"/> <source>Cylinder cannot be removed</source> <translation>氣瓶無法移除</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="373"/> + <location filename="../qt-ui/models.cpp" line="332"/> <source>This gas in use. Only cylinders that are not used in the dive can be removed.</source> <translation>此為使用氣體. 只有在潛水時, 未使用的氣體才可以被移除.</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="478"/> + <source>psi</source> + <translation>psi</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="479"/> + <source>bar</source> + <translation>bar</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="502"/> + <source>l</source> + <translation>l</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="503"/> + <source>cuft</source> + <translation>cuft</translation> + </message> </context> <context> <name>DiveComputerManagementDialog</name> @@ -155,22 +173,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Model</source> <translation>型號</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Device ID</source> <translation>裝置 ID</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1246"/> + <location filename="../qt-ui/models.cpp" line="1298"/> <source>Nickname</source> <translation>別名</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1268"/> + <location filename="../qt-ui/models.cpp" line="1320"/> <source>Clicking here will remove this divecomputer.</source> <translation>於此處按下將會移除此潛水電腦.</translation> </message> @@ -178,12 +196,12 @@ <context> <name>DiveItem</name> <message> - <location filename="../qt-ui/models.cpp" line="1107"/> + <location filename="../qt-ui/models.cpp" line="1159"/> <source> l/min</source> <translation>l/min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1109"/> + <location filename="../qt-ui/models.cpp" line="1161"/> <source> cuft/min</source> <translation>cuft/min</translation> </message> @@ -408,67 +426,67 @@ Please, remove them first.</source> <context> <name>DiveTripModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1150"/> + <location filename="../qt-ui/models.cpp" line="1202"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1151"/> + <location filename="../qt-ui/models.cpp" line="1203"/> <source>date</source> <translation>日期</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>m</source> <translation>m</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1153"/> + <location filename="../qt-ui/models.cpp" line="1205"/> <source>ft</source> <translation>ft</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1154"/> + <location filename="../qt-ui/models.cpp" line="1206"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>kg</source> <translation>kg</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1156"/> + <location filename="../qt-ui/models.cpp" line="1208"/> <source>lbs</source> <translation>lbs</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1157"/> + <location filename="../qt-ui/models.cpp" line="1209"/> <source>suit</source> <translation>防寒衣</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1158"/> + <location filename="../qt-ui/models.cpp" line="1210"/> <source>cyl</source> <translation>氣瓶</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1163"/> + <location filename="../qt-ui/models.cpp" line="1215"/> <source>location</source> <translation>位置</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1160"/> + <location filename="../qt-ui/models.cpp" line="1212"/> <source>SAC</source> <translation>耗氣率</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1161"/> + <location filename="../qt-ui/models.cpp" line="1213"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1162"/> + <location filename="../qt-ui/models.cpp" line="1214"/> <source>maxCNS</source> <translation>最大 CNS</translation> </message> @@ -498,27 +516,27 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="105"/> <source>no dives were selected</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="124"/> <source>failed to create zip file for upload: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="149"/> <source>cannot create temporary file: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="159"/> <source>internal error: %1</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="175"/> <source>internal error</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/subsurfacewebservices.cpp" line="597"/> @@ -610,32 +628,32 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="289"/> <source>Choose file for divecomputer download logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="290"/> <source>Log files (*.log)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="303"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="306"/> <source>Warning</source> <translation>提醒</translation> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="304"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="307"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="315"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="318"/> <source>Choose file for divecomputer binary dump file</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> - <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="316"/> + <location filename="../qt-ui/downloadfromdivecomputer.cpp" line="319"/> <source>Dump files (*.bin)</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -690,12 +708,12 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="118"/> <source>Save libdivecomputer logfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/downloadfromdivecomputer.ui" line="125"/> <source>Save libdivecomputer dumpfile</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> </context> <context> @@ -710,13 +728,13 @@ Please, remove them first.</source> <name>MainTab</name> <message> <location filename="../qt-ui/maintab.ui" line="18"/> - <location filename="../qt-ui/maintab.cpp" line="425"/> + <location filename="../qt-ui/maintab.cpp" line="431"/> <source>Dive Notes</source> <translation>潛水記錄</translation> </message> <message> <location filename="../qt-ui/maintab.ui" line="120"/> - <location filename="../qt-ui/maintab.cpp" line="449"/> + <location filename="../qt-ui/maintab.cpp" line="455"/> <source>Location</source> <translation>位置</translation> </message> @@ -772,7 +790,7 @@ Please, remove them first.</source> </message> <message> <location filename="../qt-ui/maintab.ui" line="208"/> - <location filename="../qt-ui/maintab.cpp" line="450"/> + <location filename="../qt-ui/maintab.cpp" line="456"/> <source>Notes</source> <translation>記錄</translation> </message> @@ -903,13 +921,13 @@ Please, remove them first.</source> <translation>增加配重系統</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="418"/> + <location filename="../qt-ui/maintab.cpp" line="424"/> <source>Trip Location</source> <translation>旅程位置</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="396"/> - <location filename="../qt-ui/maintab.cpp" line="420"/> + <location filename="../qt-ui/maintab.cpp" line="402"/> + <location filename="../qt-ui/maintab.cpp" line="426"/> <source>Trip Notes</source> <translation>旅程記錄</translation> </message> @@ -924,51 +942,51 @@ Please, remove them first.</source> <translation>取消</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="238"/> + <location filename="../qt-ui/maintab.cpp" line="244"/> <source>This trip is being edited.</source> <translation>此旅程已被編輯.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="244"/> + <location filename="../qt-ui/maintab.cpp" line="250"/> <source>Multiple dives are being edited.</source> <translation>此些旅程已被編輯.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="246"/> + <location filename="../qt-ui/maintab.cpp" line="252"/> <source>This dive is being edited.</source> <translation>此潛水已被編輯.</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="472"/> - <location filename="../qt-ui/maintab.cpp" line="480"/> - <location filename="../qt-ui/maintab.cpp" line="509"/> - <location filename="../qt-ui/maintab.cpp" line="510"/> - <location filename="../qt-ui/maintab.cpp" line="511"/> + <location filename="../qt-ui/maintab.cpp" line="478"/> + <location filename="../qt-ui/maintab.cpp" line="486"/> + <location filename="../qt-ui/maintab.cpp" line="515"/> + <location filename="../qt-ui/maintab.cpp" line="516"/> + <location filename="../qt-ui/maintab.cpp" line="517"/> <source>/min</source> <translation>/min</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="474"/> + <location filename="../qt-ui/maintab.cpp" line="480"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>N</source> <translation>N</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="983"/> + <location filename="../qt-ui/maintab.cpp" line="989"/> <source>S</source> <translation>S</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>E</source> <translation>E</translation> </message> <message> - <location filename="../qt-ui/maintab.cpp" line="984"/> + <location filename="../qt-ui/maintab.cpp" line="990"/> <source>W</source> <translation>W</translation> </message> @@ -1880,7 +1898,7 @@ Please, remove them first.</source> <message> <location filename="../qt-ui/profilegraphics.cpp" line="172"/> <source>Unhide all events</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../qt-ui/profilegraphics.cpp" line="212"/> @@ -1986,72 +2004,72 @@ Please, remove them first.</source> <context> <name>ProfilePrintModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1619"/> + <location filename="../qt-ui/models.cpp" line="1671"/> <source>unknown</source> <translation>未知</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1624"/> + <location filename="../qt-ui/models.cpp" line="1676"/> <source>Dive #%1 - %2</source> <translation>潛水 #%1 - %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1627"/> + <location filename="../qt-ui/models.cpp" line="1679"/> <source>Max depth: %1 %2</source> <translation>最大深度: %1 %2</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1634"/> + <location filename="../qt-ui/models.cpp" line="1686"/> <source>Duration: %1 min</source> <translation>區間: %1 min</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1639"/> + <location filename="../qt-ui/models.cpp" line="1691"/> <source>Gas Used:</source> <translation>消耗氣體: </translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1641"/> + <location filename="../qt-ui/models.cpp" line="1693"/> <source>SAC:</source> <translation>耗氣率: </translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1643"/> + <location filename="../qt-ui/models.cpp" line="1695"/> <source>Max. CNS:</source> <translation>最大 CNS:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1645"/> + <location filename="../qt-ui/models.cpp" line="1697"/> <source>Weights:</source> <translation>配重:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1650"/> + <location filename="../qt-ui/models.cpp" line="1702"/> <source>Notes:</source> <translation>記錄:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1657"/> + <location filename="../qt-ui/models.cpp" line="1709"/> <source>Divemaster:</source> <translation>導潛:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1659"/> + <location filename="../qt-ui/models.cpp" line="1711"/> <source>Buddy:</source> <translation>潛伴:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1661"/> + <location filename="../qt-ui/models.cpp" line="1713"/> <source>Suit:</source> <translation>防寒衣：</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1663"/> + <location filename="../qt-ui/models.cpp" line="1715"/> <source>Viz:</source> <translation>Viz:</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1665"/> + <location filename="../qt-ui/models.cpp" line="1717"/> <source>Rating:</source> <translation>評分:</translation> </message> @@ -2212,17 +2230,17 @@ Please, remove them first.</source> <context> <name>TankInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>Description</source> <translation>描述</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>ml</source> <translation>ml</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="772"/> + <location filename="../qt-ui/models.cpp" line="824"/> <source>bar</source> <translation>bar</translation> </message> @@ -2230,7 +2248,7 @@ Please, remove them first.</source> <context> <name>ToolTipItem</name> <message> - <location filename="../qt-ui/profilegraphics.cpp" line="1562"/> + <location filename="../qt-ui/profilegraphics.cpp" line="1568"/> <source>Information</source> <translation>資訊</translation> </message> @@ -2238,12 +2256,12 @@ Please, remove them first.</source> <context> <name>WSInfoModel</name> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>Description</source> <translation>描述</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="644"/> + <location filename="../qt-ui/models.cpp" line="696"/> <source>kg</source> <translation>kg</translation> </message> @@ -2299,97 +2317,117 @@ Please, remove them first.</source> <context> <name>WeightModel</name> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Type</source> <translation>類型</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="387"/> + <location filename="../qt-ui/models.cpp" line="346"/> <source>Weight</source> <translation>重量</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="447"/> + <location filename="../qt-ui/models.cpp" line="406"/> <source>Clicking here will remove this weigthsystem.</source> <translation>按此處移除配重系統</translation> </message> + <message> + <location filename="../qt-ui/models.cpp" line="431"/> + <source>kg</source> + <translation>kg</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="432"/> + <source>lbs</source> + <translation>lbs</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="455"/> + <source>ft</source> + <translation>ft</translation> + </message> + <message> + <location filename="../qt-ui/models.cpp" line="456"/> + <source>m</source> + <translation>m</translation> + </message> </context> <context> <name>YearlyStatisticsModel</name> <message> - <location filename="../qt-ui/models.cpp" line="1422"/> + <location filename="../qt-ui/models.cpp" line="1474"/> <source>Year > Month / Trip</source> <translation>年 > 月 / 旅程</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1423"/> + <location filename="../qt-ui/models.cpp" line="1475"/> <source>#</source> <translation>#</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1424"/> + <location filename="../qt-ui/models.cpp" line="1476"/> <source>Duration Total</source> <translation>區間 全部</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1425"/> + <location filename="../qt-ui/models.cpp" line="1477"/> <source> Average</source> <translation> 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1426"/> + <location filename="../qt-ui/models.cpp" line="1478"/> <source> Shortest</source> <translation> 最短</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1427"/> + <location filename="../qt-ui/models.cpp" line="1479"/> <source> Longest</source> <translation> 最長</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1428"/> + <location filename="../qt-ui/models.cpp" line="1480"/> <source>Depth (%1) Average</source> <translation>深度 (%1) 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1429"/> - <location filename="../qt-ui/models.cpp" line="1432"/> - <location filename="../qt-ui/models.cpp" line="1435"/> + <location filename="../qt-ui/models.cpp" line="1481"/> + <location filename="../qt-ui/models.cpp" line="1484"/> + <location filename="../qt-ui/models.cpp" line="1487"/> <source> Minimum</source> <translation> 最小</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1430"/> - <location filename="../qt-ui/models.cpp" line="1433"/> - <location filename="../qt-ui/models.cpp" line="1436"/> + <location filename="../qt-ui/models.cpp" line="1482"/> + <location filename="../qt-ui/models.cpp" line="1485"/> + <location filename="../qt-ui/models.cpp" line="1488"/> <source> Maximum</source> <translation> 最大</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1431"/> + <location filename="../qt-ui/models.cpp" line="1483"/> <source>SAC (%1) Average</source> <translation>耗氣率 (%1) 平均</translation> </message> <message> - <location filename="../qt-ui/models.cpp" line="1434"/> + <location filename="../qt-ui/models.cpp" line="1486"/> <source>Temp. (%1) Average</source> <translation>溫度 (%1) @@ -2708,84 +2746,84 @@ Maximum</source> <translation>樣本解析錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="618"/> + <location filename="../libdivecomputer.c" line="619"/> <source>Event: waiting for user action</source> <translation>事件: 等待使用者動作</translation> </message> <message> - <location filename="../libdivecomputer.c" line="626"/> + <location filename="../libdivecomputer.c" line="627"/> <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="668"/> + <location filename="../libdivecomputer.c" line="687"/> <source>Error registering the event handler.</source> <translation>錯誤的註冊程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="673"/> + <location filename="../libdivecomputer.c" line="692"/> <source>Error registering the cancellation handler.</source> <translation>錯誤的註冊取消程序.</translation> </message> <message> - <location filename="../libdivecomputer.c" line="693"/> + <location filename="../libdivecomputer.c" line="712"/> <source>Dive data import error</source> <translation>匯入潛水資料錯誤</translation> </message> <message> - <location filename="../libdivecomputer.c" line="729"/> + <location filename="../libdivecomputer.c" line="750"/> <source>Unable to create libdivecomputer context</source> <translation>無法建立 libdivecomputer 上下文</translation> </message> <message> - <location filename="../libdivecomputer.c" line="736"/> + <location filename="../libdivecomputer.c" line="757"/> <source>Unable to open %s %s (%s)</source> <translation> 無法開啟 %s %s (%s)</translation> </message> <message> - <location filename="../parse-xml.c" line="480"/> + <location filename="../parse-xml.c" line="479"/> <source>Strange percentage reading %s </source> <translation>有問題的讀取比例 %s </translation> </message> <message> - <location filename="../parse-xml.c" line="1617"/> - <source>Failed to parse '%s'. + <location filename="../parse-xml.c" line="1616"/> + <source>Failed to parse '%s'. </source> <translation>無法解析訊息 '%s' . </translation> </message> <message> - <location filename="../parse-xml.c" line="1618"/> + <location filename="../parse-xml.c" line="1617"/> <source>Failed to parse '%s'</source> <translation>無法解析訊息 '%s'</translation> </message> <message> - <location filename="../parse-xml.c" line="1816"/> + <location filename="../parse-xml.c" line="1815"/> <source>Database query get_events failed. </source> <translation>資料庫讀取 get_events 失敗. </translation> </message> <message> - <location filename="../parse-xml.c" line="1851"/> - <source>Database connection failed '%s'. + <location filename="../parse-xml.c" line="1850"/> + <source>Database connection failed '%s'. </source> <translation>資料庫連結錯誤 '%s' . </translation> </message> <message> - <location filename="../parse-xml.c" line="1858"/> - <source>Database query failed '%s'. + <location filename="../parse-xml.c" line="1857"/> + <source>Database query failed '%s'. </source> <translation>資料庫要求錯誤 '%s' . </translation> </message> <message> - <location filename="../parse-xml.c" line="1918"/> + <location filename="../parse-xml.c" line="1917"/> <source>Can't open stylesheet %s</source> - <translation type="unfinished"></translation> + <translation type="unfinished"/> </message> <message> <location filename="../planner.c" line="99"/> @@ -3534,4 +3572,4 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>電池低電量警示</translation> </message> </context> -</TS> +</TS>
\ No newline at end of file |